summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)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
* commit '9ab65ff27edf6940b344c4489a27e444a1b658f9': Fixes screenshots for PermissionRequest sample
2015-01-23Fixes screenshots for PermissionRequest sampleBenjamin Weiss1-1/+2
Change-Id: Iaf0d931eaa0990001b1dc2e72af69ad1f9887e0f
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
* commit 'bc81ae6adf702d8470859893afe84d33c0b52c6c': Camera2Basic: Fix the Toast that sticks to screen
2015-01-20Camera2Basic: Fix the Toast that sticks to screenYuichi Araki2-12/+75
Bug: 18707934 Change-Id: I5d122ee181b65e33581aa582abe71cbd36b048b7
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
* commit 'a4e2e27771eaac45d544fc799e7459f9a8406951': Port legacy "WeartherListWidget" to template system.
2015-01-08am 2989852b: Port legacy "WeartherListWidget" to template system.Jan-Felix Schmakeit37-0/+1694
* commit '2989852bd9ad63395a956a3221ecac4c2fd55271': Port legacy "WeartherListWidget" to template system.
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
Change-Id: I638d5a1fc0a93946fee6e16e1ca989f01a7b2aa9
2015-01-07am 344c5a3f: am 5c90c5c4: Merge "Add metadata and update icon for ↵Jan-Felix Schmakeit8-6/+67
BorderlessButtons sample." into lmp-docs * commit '344c5a3fdd89ffdee2dec4877cb2fd84f22943c4': Add metadata and update icon for BorderlessButtons sample.
2015-01-07am 5c90c5c4: Merge "Add metadata and update icon for BorderlessButtons ↵Jan-Felix Schmakeit8-6/+67
sample." into lmp-docs * commit '5c90c5c48a831b569dbc5d181479e143f9966723': Add metadata and update icon for BorderlessButtons sample.
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 ↵Paul Soulos1-12/+0
android:taskAffinity from watchface samples * commit '921e506246f15e481283127b55d8a19b85a9d33c': Removes android:allowEmbedded and android:taskAffinity from watchface samples
2015-01-07am 45fb511d: Removes android:allowEmbedded and android:taskAffinity from ↵Paul Soulos1-12/+0
watchface samples * commit '45fb511df27a269c9ed04fa436748d813486289e': Removes android:allowEmbedded and android:taskAffinity from watchface samples
2015-01-06Removes android:allowEmbedded and android:taskAffinity from watchface samplesPaul Soulos1-12/+0
bug: 18723025 Change-Id: I0b402f1c737672f17e3daf9b27d3daf417c6268f
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" ↵Natalie Masse5-0/+55
into lmp-docs * commit '5899b622e6d206377e5d86431f5a470afadcc31d': metadata added for sample BluetoothChat
2014-12-30am ea30e161: Merge "metadata added for sample BluetoothChat" into lmp-docsNatalie Masse5-0/+55
* commit 'ea30e1611e17f1ad6bc3ba6a3b631f3dd8a40142': metadata added for sample BluetoothChat
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" ↵Trevor Johns3-2/+47
into lmp-docs * commit '463ddb805c9428b45a507d27b4a725898b1498bd': Add metadata for BasicRenderScript sample
2014-12-24am c56231ec: am d99e77da: Merge "Add metadata for RenderScriptIntrinsic ↵Trevor Johns3-2/+55
sample" into lmp-docs * commit 'c56231eca5bfb410c092c02ecc170ea32f6b4875': Add metadata for RenderScriptIntrinsic sample
2014-12-24am 3d1e6cfa: Merge "Add metadata for BasicRenderScript sample" into lmp-docsTrevor Johns3-2/+47
* commit '3d1e6cfac08183ecb2dcba76ab9455bead00a92c': Add metadata for BasicRenderScript sample
2014-12-24am d99e77da: Merge "Add metadata for RenderScriptIntrinsic sample" into lmp-docsTrevor Johns3-2/+55
* commit 'd99e77dad77af48bf738e928647f7d6bc2855a0d': Add metadata for RenderScriptIntrinsic sample
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" ↵Trevor Johns5-0/+45
into lmp-docs * commit '6103132b06e90e1f36c608611f9317c3c8067eef': Add metadata for LNotifications sample
2014-12-24am 28476e6f: Merge "Add metadata for LNotifications sample" into lmp-docsTrevor Johns5-0/+45
* commit '28476e6fbe5e61412c3332dac2bcea2330fee8b8': Add metadata for LNotifications sample
2014-12-24am 51975496: am 209a5d4b: Merge "Add metadata for EmbeddedApp sample" into ↵Trevor Johns1-0/+50
lmp-docs * commit '5197549638a9e2194cb328c7c619ff35344ec7ae': Add metadata for EmbeddedApp sample
2014-12-24am 812035a5: am e93f3b90: Merge "Add metadata for TextLinkify sample" into ↵Trevor Johns3-0/+53
lmp-docs * commit '812035a5ef116683ac55b1b29bf5520670931e16': Add metadata for TextLinkify sample
2014-12-24Merge "Add metadata for LNotifications sample" into lmp-docsTrevor Johns5-0/+45
2014-12-23Add metadata for BasicRenderScript sampleTrevor Johns3-2/+47
Change-Id: Ic8ac1f581c4e67dcd6e17ef8ce75e5a0ee71848f
2014-12-23am 209a5d4b: Merge "Add metadata for EmbeddedApp sample" into lmp-docsTrevor Johns1-0/+50
* commit '209a5d4bf94533e78e72a229de6b0f250d9c6882': Add metadata for EmbeddedApp sample
2014-12-23am e93f3b90: Merge "Add metadata for TextLinkify sample" into lmp-docsTrevor Johns3-0/+53
* commit 'e93f3b907cf06189b51ff677cefb4f497fe82cf1': Add metadata for TextLinkify sample
2014-12-23Add metadata for LNotifications sampleTrevor Johns5-0/+45
Change-Id: Ibf5ff53adf6aff03a47762252eb1821d9905287e
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
Change-Id: I8dd368cf196553ab5bec7c519286220acb02d516
2014-12-22am e9934cd2: am 30a5396e: Fixed broken XMLShailen Tuli1-1/+0
* commit 'e9934cd24eb3bde0f8c27e402d29aef4aa9bb347': Fixed broken XML
2014-12-22am 30a5396e: Fixed broken XMLShailen Tuli1-1/+0
* commit '30a5396e4e43dd7b66af5e43585f49fd49544882': Fixed broken XML
2014-12-22Fixed broken XMLShailen Tuli1-1/+0
Change-Id: I977ea46987ef92ef2f65f7ff68be7cab89cfc9fc
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 ↵Shailen Tuli3-3/+43
sample" into lmp-docs * commit '058efa76d4b709c84e04879b494d42449880d5f6': Created metadata for AdvancedImmersiveMode sample
2014-12-19am f686d8fb: Merge "Created metadata for AdvancedImmersiveMode sample" into ↵Shailen Tuli3-3/+43
lmp-docs * commit 'f686d8fb30df27140e27debca4c679367f879142': Created metadata for AdvancedImmersiveMode sample
2014-12-19Merge "Created metadata for AdvancedImmersiveMode sample" into lmp-docsShailen Tuli3-3/+43
2014-12-19am 3b564efd: am 91149dca: Merge "Metadata for SwipeRefreshListFragment ↵Shailen Tuli3-3/+39
sample" into lmp-docs * commit '3b564efd685214cdefa983382092fce1ee6e6e76': Metadata for SwipeRefreshListFragment sample
2014-12-19am e231b1cd: am ab8c18b3: Merge "Metadata for ElevationBasic sample" into ↵Shailen Tuli4-0/+54
lmp-docs * commit 'e231b1cd80a46d6ad04ae4b91c55944fd7820a00': Metadata for ElevationBasic sample
2014-12-19am 62a069b9: am 611468ac: Merge "Metadata for BasicMultitouch sample" into ↵Shailen Tuli4-2/+45
lmp-docs * commit '62a069b9f7434d54dc2310426ee926e0235c1361': Metadata for BasicMultitouch sample
2014-12-19am 07288a32: am b3e97a1e: Merge "Metadata for Interpolator sample" into lmp-docsShailen Tuli4-0/+41
* commit '07288a329656e63e271efff2d84bf88a4511c0a5': Metadata for Interpolator sample