summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-7.1.1_r4' into cm-14.1cm-14.1_prerebaseDan Pasanen2016-12-05268-630/+10847
|\
| * 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | docs: Add new samples for N MR1Trevor Johns2016-10-1843-0/+1683
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | docs: Add new samples for N MR1Trevor Johns2016-10-1843-0/+1683
| * | | | | | | | | | | | | | | Delete development_settings.xmlNick Kralevich2016-10-122-192/+0
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | SDK Platforms 25.0.0 config file updateChris Iremonger2016-10-071-1/+1
| * | | | | | | | | | | | | | Android 7.1.1 DP1 / SDK API 25.0.0Chris Iremonger2016-10-063-5/+4
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Emulator: reset sdk system images revision to 1bohu2016-10-055-5/+5
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4 am: bf0ff8fe8aTrevor Johns2016-09-291-0/+1
| |\| | | | | | | | | | |
| | * | | | | | | | | | | Re-add WearNotifications sample to build/sdk.atree am: ccc3c96cd4Trevor Johns2016-09-291-0/+1
| | |\| | | | | | | | | |
| | | * | | | | | | | | | Re-add WearNotifications sample to build/sdk.atreeTrevor Johns2016-09-291-0/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Re-add WearNotifications sample to build/sdk.atreeTrevor Johns2016-09-291-0/+1
| * | | | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ...Trevor Johns2016-09-290-0/+0
| |\| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ...Trevor Johns2016-09-290-0/+0
| | |\| | | | | | | | | | |
| | | * | | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ...Trevor Johns2016-09-290-0/+0
| | | |\| | | | | | | | | |
| | | | * | | | | | | | | | Merge "Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: ...Android Build Merger (Role)2016-09-290-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3d...Trevor Johns2016-09-290-0/+0
| |\| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3d...Trevor Johns2016-09-290-0/+0
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3d...Trevor Johns2016-09-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179 am: 70eaf3de15Trevor Johns2016-09-291-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Revert "Add WearNotifications sample to sdk.atree" am: 8b0e298179Trevor Johns2016-09-291-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| * | | | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: e48244707b am: af01474428Trevor Johns2016-09-291-1/+0
| |\| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree" am: e48244707bTrevor Johns2016-09-291-1/+0
| | |\| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | Revert "Add WearNotifications sample to sdk.atree"Trevor Johns2016-09-291-1/+0
| | | | |/ / / / / / / / / / / / /
| * | | | | | | / / / / / / / / / Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c...Trevor Johns2016-09-291-0/+1
| |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c...Trevor Johns2016-09-291-0/+1
| | |\| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19 am: c...Trevor Johns2016-09-291-0/+1
| | | |\| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59 am: ae8eec3f19Trevor Johns2016-09-291-0/+1
| | | | |\| | | | | | | | | | |
| | | | | * | | | | | | | | | | Add WearNotifications sample to sdk.atree am: f765bdac59Trevor Johns2016-09-291-0/+1
| | | | | |\| | | | | | | | | |
| | | | | | * | | | | | | | | | Add WearNotifications sample to sdk.atreeTrevor Johns2016-09-291-0/+1
| | | | | | |\| | | | | | | | |
| | | | | | | * | | | | | | | | Add WearNotifications sample to sdk.atreeTrevor Johns2016-09-291-0/+1
| * | | | | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev. am: 697d71f7cc am: dbd82b9b22Trevor Johns2016-09-29207-398/+9071
| |\| | | | | | | | | | | | | | | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev. am: 697d71f7ccTrevor Johns2016-09-29207-398/+9071
| | |\| | | | | | | | | | | |
| | | * | | | | | | | | | | | Syncing latest sample prebuilts for mnc-dev.Trevor Johns2016-09-29207-398/+9071
| | | |\| | | | | | | | | | |