summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2015-01-26merge in lmp-mr1-release history after reset to lmp-mr1-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r6android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1aosp-new/lollipop-mr1-releaseaosp-new/lollipop-mr1-cts-releaseThe Android Automerger0-0/+0
2015-01-23am 9ab65ff2: Fixes screenshots for PermissionRequest sampleandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewaosp-new/master-soongaosp-new/lollipop-mr1-devBenjamin Weiss1-1/+2
2015-01-23Fixes screenshots for PermissionRequest sampleBenjamin Weiss1-1/+2
2015-01-21merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger0-0/+0
2015-01-20am bc81ae6a: Camera2Basic: Fix the Toast that sticks to screenYuichi Araki2-12/+75
2015-01-20Camera2Basic: Fix the Toast that sticks to screenYuichi Araki2-12/+75
2015-01-12merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger0-0/+0
2015-01-08am a4e2e277: am 2989852b: Port legacy "WeartherListWidget" to template system.Jan-Felix Schmakeit37-0/+1694
2015-01-08am 2989852b: Port legacy "WeartherListWidget" to template system.Jan-Felix Schmakeit37-0/+1694
2015-01-07merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger0-0/+0
2015-01-07Port legacy "WeartherListWidget" to template system.Jan-Felix Schmakeit37-0/+1694
2015-01-07am 344c5a3f: am 5c90c5c4: Merge "Add metadata and update icon for BorderlessB...Jan-Felix Schmakeit8-6/+67
2015-01-07am 5c90c5c4: Merge "Add metadata and update icon for BorderlessButtons sample...Jan-Felix Schmakeit8-6/+67
2015-01-07Merge "Add metadata and update icon for BorderlessButtons sample." into lmp-docsJan-Felix Schmakeit8-6/+67
2015-01-07am 921e5062: am 45fb511d: Removes android:allowEmbedded and android:taskAffin...Paul Soulos1-12/+0
2015-01-07am 45fb511d: Removes android:allowEmbedded and android:taskAffinity from watc...Paul Soulos1-12/+0
2015-01-06Removes android:allowEmbedded and android:taskAffinity from watchface samplesPaul Soulos1-12/+0
2015-01-06merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger0-0/+0
2014-12-30am 5899b622: am ea30e161: Merge "metadata added for sample BluetoothChat" int...Natalie Masse5-0/+55
2014-12-30am ea30e161: Merge "metadata added for sample BluetoothChat" into lmp-docsNatalie Masse5-0/+55
2014-12-30Merge "metadata added for sample BluetoothChat" into lmp-docsNatalie Masse5-0/+55
2014-12-24am 463ddb80: am 3d1e6cfa: Merge "Add metadata for BasicRenderScript sample" i...Trevor Johns3-2/+47
2014-12-24am c56231ec: am d99e77da: Merge "Add metadata for RenderScriptIntrinsic sampl...Trevor Johns3-2/+55
2014-12-24am 3d1e6cfa: Merge "Add metadata for BasicRenderScript sample" into lmp-docsTrevor Johns3-2/+47
2014-12-24am d99e77da: Merge "Add metadata for RenderScriptIntrinsic sample" into lmp-docsTrevor Johns3-2/+55
2014-12-24Merge "Add metadata for BasicRenderScript sample" into lmp-docsTrevor Johns3-2/+47
2014-12-24Merge "Add metadata for RenderScriptIntrinsic sample" into lmp-docsTrevor Johns3-2/+55
2014-12-24am 6103132b: am 28476e6f: Merge "Add metadata for LNotifications sample" into...Trevor Johns5-0/+45
2014-12-24am 28476e6f: Merge "Add metadata for LNotifications sample" into lmp-docsTrevor Johns5-0/+45
2014-12-24am 51975496: am 209a5d4b: Merge "Add metadata for EmbeddedApp sample" into lm...Trevor Johns1-0/+50
2014-12-24am 812035a5: am e93f3b90: Merge "Add metadata for TextLinkify sample" into lm...Trevor Johns3-0/+53
2014-12-24Merge "Add metadata for LNotifications sample" into lmp-docsTrevor Johns5-0/+45
2014-12-23Add metadata for BasicRenderScript sampleTrevor Johns3-2/+47
2014-12-23am 209a5d4b: Merge "Add metadata for EmbeddedApp sample" into lmp-docsTrevor Johns1-0/+50
2014-12-23am e93f3b90: Merge "Add metadata for TextLinkify sample" into lmp-docsTrevor Johns3-0/+53
2014-12-23Add metadata for LNotifications sampleTrevor Johns5-0/+45
2014-12-23Merge "Add metadata for EmbeddedApp sample" into lmp-docsTrevor Johns1-0/+50
2014-12-23Merge "Add metadata for TextLinkify sample" into lmp-docsTrevor Johns3-0/+53
2014-12-23Add metadata for RenderScriptIntrinsic sampleTrevor Johns3-2/+55
2014-12-22am e9934cd2: am 30a5396e: Fixed broken XMLShailen Tuli1-1/+0
2014-12-22am 30a5396e: Fixed broken XMLShailen Tuli1-1/+0
2014-12-22Fixed broken XMLShailen Tuli1-1/+0
2014-12-22merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger0-0/+0
2014-12-19am 058efa76: am f686d8fb: Merge "Created metadata for AdvancedImmersiveMode s...Shailen Tuli3-3/+43
2014-12-19am f686d8fb: Merge "Created metadata for AdvancedImmersiveMode sample" into l...Shailen Tuli3-3/+43
2014-12-19Merge "Created metadata for AdvancedImmersiveMode sample" into lmp-docsShailen Tuli3-3/+43
2014-12-19am 3b564efd: am 91149dca: Merge "Metadata for SwipeRefreshListFragment sample...Shailen Tuli3-3/+39
2014-12-19am e231b1cd: am ab8c18b3: Merge "Metadata for ElevationBasic sample" into lmp...Shailen Tuli4-0/+54
2014-12-19am 62a069b9: am 611468ac: Merge "Metadata for BasicMultitouch sample" into lm...Shailen Tuli4-2/+45
2014-12-19am 07288a32: am b3e97a1e: Merge "Metadata for Interpolator sample" into lmp-docsShailen Tuli4-0/+41