summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebaseDan Pasanen2016-12-05268-630/+10847
|\ | | | | | | | | | | | | | | Android 7.1.1 release 4 # gpg: Signature made Thu Dec 1 13:06:51 2016 CST # gpg: using DSA key E8AD3F819AB10E78 # gpg: Can't check signature: No public key
| * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-190-0/+0
| |\
| | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-160-0/+0
| | |\
| | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-090-0/+0
| | | |\
| | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-060-0/+0
| | | | |\
| | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-10-020-0/+0
| | | | | |\
| | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-290-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-250-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-200-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-09-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-290-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-240-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-230-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in nyc-mr1-release history after reset to nyc-mr1-devgitbuildkicker2016-08-210-0/+0
| | | | | | | | | | | | | |\
| * | | | | | | | | | | | | \ docs: Add new samples for N MR1 am: 0af1e772c4Trevor Johns2016-10-1843-0/+1683
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2b4561c639 Change-Id: I9fd2e353866986677a9724931196820afabd6dc2
| | * | | | | | | | | | | | | docs: Add new samples for N MR1Trevor Johns2016-10-1843-0/+1683
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 0af1e772c4 Change-Id: Ifb45550dc950204362d88e31901243ddd50ba9ed
| | | * | | | | | | | | | | | | docs: Add new samples for N MR1Trevor Johns2016-10-1843-0/+1683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - AppShortcuts - CommitContentSampleApp - CommitContentSampleIME Change-Id: I3cefc134839f944b1c0c5efc943fb779c7e7ee70
| * | | | | | | | | | | | | | | Delete development_settings.xmlNick Kralevich2016-10-122-192/+0
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does not appear to be used. Also delete stale references in strings.xml. Bug: 21388590 Change-Id: I032a3f88624c589e007367693711464401a21a63
| * | | | | | | | | | | | | | SDK Platforms 25.0.0 config file updateChris Iremonger2016-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2e77b6934239defec69bfb8346e0d18cf7be81b
| * | | | | | | | | | | | | | Android 7.1.1 DP1 / SDK API 25.0.0Chris Iremonger2016-10-063-5/+4
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedecab5a8f82b964eed0b5e4c41166cfca188d29
| * | | | | | | | | | | | | Emulator: reset sdk system images revision to 1bohu2016-10-055-5/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 31973190 Change-Id: I2411df8912199129d5fc3b5f243b56192579b63f
| * | | | | | | | | | | | Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8aTrevor Johns2016-09-291-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c610246491 Change-Id: Ie7c474f75e7723b5acde7305f71800fcb87c796f
| | * | | | | | | | | | | Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4Trevor Johns2016-09-291-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bf0ff8fe8a Change-Id: I7b38c0562da06941a4011f66277ae7f56965c299
| | | * | | | | | | | | | Re-add WearNotifications sample to build/sdk.atreeTrevor Johns2016-09-291-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ccc3c96cd4 Change-Id: I010be975d300af90436bae94393244c197b62b0f
| | | | * | | | | | | | | | Re-add WearNotifications sample to build/sdk.atreeTrevor Johns2016-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2af96ce2015d05bb189504d944b7dd7cdcf3c065
| * | | | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4 am: c869b66d5e Change-Id: I17c6e90724d1025bcc731a67e54065bd0f674ae4
| | * | | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be am: c6f2d3a7b4 Change-Id: Ib0860fe5a4acff75b6c4d36d05162b14ec6b83aa
| | | * | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85" into nyc-docs am: dd604550be Change-Id: I1d314a556d57054b8ac1f15f50c7a07976bde8ff
| | | | * | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Android Build Merger (Role)2016-09-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85" into nyc-docs
| * | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c am: 4adef0f229 Change-Id: I13412368d28e2fb87cf13bb949534565a6320942
| | * | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 am: 61a495323c Change-Id: I5397c07c3b69cdbc29c8c5fbc6183735fff60d0f
| | | * | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ↵Trevor Johns2016-09-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70eaf3de15 am: dfa6375f85 am: 17f1bd13e0 Change-Id: I71b758ea775bd0ec4e228e103cf959ad492dcf4c
| | | | * | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15Trevor Johns2016-09-291-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dfa6375f85 Change-Id: Ie276238f23dbbb80fa8141a7bb0b4475d32d2fc5
| | | | | * \ \ \ \ \ \ \ \ \ \ Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179Trevor Johns2016-09-291-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 70eaf3de15 Change-Id: I4e1e310a3f65fa7e7a9e02b8ac8b0674903b5054
| | | | | | * \ \ \ \ \ \ \ \ \ \ Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8b0e298179 Change-Id: I5d1d11bbb43faf933bb3bb56a46986bdaa06b08d
| | | | | | | * | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f765bdac593cc8602089250856e148fd0190cc71. Change-Id: I59294be08998e945eec99c549ac45a70feef0d04
| * | | | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428Trevor Johns2016-09-291-1/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 45fad88225 Change-Id: Id424778fa4c74566516998fd3c94b12bf3108cac
| | * | | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: e48244707bTrevor Johns2016-09-291-1/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: af01474428 Change-Id: Ic85dea9aaaf4a561b5b7976c5804988a8fcb86c2
| | | * | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e48244707b Change-Id: I9ef1118d010ffe92aa3c03089703b9e4d4520655
| | | | * | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f765bdac593cc8602089250856e148fd0190cc71. Change-Id: I59294be08998e945eec99c549ac45a70feef0d04 (cherry picked from commit 8b0e2981799ee0e42c61d214ae67e7fd86219528)
| * | | | | | | / / / / / / / / / Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: ↵Trevor Johns2016-09-291-0/+1
| |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c407cfe212 am: f48e6ce63a am: af4e7ac1f9 am: 55270a9ba5 Change-Id: I441af3d86f7189d743af8c293b4d345a613413a2
| | * | | | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: ↵Trevor Johns2016-09-291-0/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c407cfe212 am: f48e6ce63a am: af4e7ac1f9 Change-Id: I7a890eb2bad9abcee05c5cb54062d301d967a044
| | | * | | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: ↵Trevor Johns2016-09-291-0/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c407cfe212 am: f48e6ce63a Change-Id: I65d0e0937d80a297f5007fffd549428cae2014c6
| | | | * | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19Trevor Johns2016-09-291-0/+1
| | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: c407cfe212 Change-Id: Ib4fa3b88e0f7275ea7387e13a98725e0430fb5b8
| | | | | * | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59Trevor Johns2016-09-291-0/+1
| | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: ae8eec3f19 Change-Id: Ib5ca39c7192e6c8eed61df113ffb61e501ccf15f
| | | | | | * | | | | | | | | | Add WearNotifications sample to sdk.atreeTrevor Johns2016-09-291-0/+1
| | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f765bdac59 Change-Id: I9c2218617b10d4cb485f7bd108834a1391b54545
| | | | | | | * | | | | | | | | Add WearNotifications sample to sdk.atreeTrevor Johns2016-09-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic8148afcbc842478624eefc4a414e7a18a6f5a93
| * | | | | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev. am: 697d71f7cc am: dbd82b9b22Trevor Johns2016-09-29207-398/+9071
| |\| | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: d3f580780b Change-Id: I04f552f971bf45e416b81b970c1b4443fa46de3c
| | * | | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev. am: 697d71f7ccTrevor Johns2016-09-29207-398/+9071
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dbd82b9b22 Change-Id: I2ace1b9340ed24f714da0eec682207d0101b55f1
| | | * | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev.Trevor Johns2016-09-29207-398/+9071
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 697d71f7cc Change-Id: Ib9c266f3e5faef60acb43617a595333a2ffc1aa9
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-12 13:33:45 +0000