summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
|\ | | | | | | | | | | | | BlendingMode." into lmp-dev * commit 'efc09c644fa4e8354d54485aab6c0b18868284eb': Fix cyclic dependency in BlendComposite and BlendingMode.
| * am 78660423: Merge "Fix cyclic dependency in BlendComposite and ↵Deepanshu Gupta2015-03-121-16/+9
| |\ | | | | | | | | | | | | | | | | | | BlendingMode." into lmp-dev * commit '78660423900fa255cc83b85320e98d5184be393b': Fix cyclic dependency in BlendComposite and BlendingMode.
| | * Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-devDeepanshu Gupta2015-03-121-16/+9
| | |\
| | | * Fix cyclic dependency in BlendComposite and BlendingMode.Deepanshu Gupta2015-03-111-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4 Bug: http://b.android.com/159708 Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
* | | | Merge "Fix rare NPE in BridgeContext." into lmp-mr1-devDeepanshu Gupta2015-03-121-23/+32
|\ \ \ \
| * | | | Fix rare NPE in BridgeContext.Deepanshu Gupta2015-03-111-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed some deprecation warnings. Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
* | | | | Merge "Fix project settings." into lmp-mr1-devDeepanshu Gupta2015-03-122-2/+28
|\ \ \ \ \ | |/ / / /
| * | | | Fix project settings.Deepanshu Gupta2015-03-102-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Update layoutlib_api source path. 2. Update jdk version 3. Update nullity annotations. Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
* | | | | Merge "Add RecyclerView support." into lmp-mr1-devDeepanshu Gupta2015-03-127-10/+332
|\ \ \ \ \ | |/ / / /
| * | | | Add RecyclerView support.Deepanshu Gupta2015-03-107-10/+332
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/72117 Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
* | | | | am c706a980: am a236a49e: am 47426f1c: Merge "docs: Added overview page and ↵Quddus Chong2015-03-11131-52/+196345
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Javadocs for the Android Testing Support Library." into lmp-docs * commit 'c706a980e426ea0e0b6aaee5530516b1a16c3755': docs: Added overview page and Javadocs for the Android Testing Support Library.
| * | | | am a236a49e: am 47426f1c: Merge "docs: Added overview page and Javadocs for ↵Quddus Chong2015-03-11131-52/+196345
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | the Android Testing Support Library." into lmp-docs * commit 'a236a49edec87cd24fe683550c0ab83be3dcbf07': docs: Added overview page and Javadocs for the Android Testing Support Library.
| | * | | am 47426f1c: Merge "docs: Added overview page and Javadocs for the Android ↵Quddus Chong2015-03-11131-52/+196345
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Testing Support Library." into lmp-docs * commit '47426f1c190b17548eabb50fad3945844f1a7363': docs: Added overview page and Javadocs for the Android Testing Support Library.
| | | * \ \ Merge "docs: Added overview page and Javadocs for the Android Testing ↵Quddus Chong2015-03-11131-52/+196345
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Support Library." into lmp-docs
| | | | * | | docs: Added overview page and Javadocs for the Android Testing Support Library.Quddus Chong2015-03-11131-52/+196345
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
* | | | | | | am ca0db1a0: am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto ↵Luan Nguyen2015-03-1140-34/+36
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | landing and design page image assets"" into lmp-docs * commit 'ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec': Revert "docs: Update auto landing and design page image assets"
| * | | | | | am eeb79d10: am 9a7238d8: Merge "Revert "docs: Update auto landing and ↵Luan Nguyen2015-03-1140-34/+36
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design page image assets"" into lmp-docs * commit 'eeb79d104fc09ea727108bde7a7ef06f3300241a': Revert "docs: Update auto landing and design page image assets"
| | * | | | | am 9a7238d8: Merge "Revert "docs: Update auto landing and design page image ↵Luan Nguyen2015-03-1140-34/+36
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | assets"" into lmp-docs * commit '9a7238d8f5bd4ec90c2b887808ea26e5f55d0154': Revert "docs: Update auto landing and design page image assets"
| | | * | | Merge "Revert "docs: Update auto landing and design page image assets"" into ↵Luan Nguyen2015-03-1140-34/+36
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | | | * | | Revert "docs: Update auto landing and design page image assets"Luan Nguyen2015-03-1140-34/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898. Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
* | | | | | | am 42ee70aa: am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and ↵Luan Nguyen2015-03-1140-36/+34
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | design page image assets" into lmp-docs * commit '42ee70aac023da26a6dc4dee5856871372e792e8': docs: Update auto landing and design page image assets
| * | | | | | am 24b4e572: am 0fc17c37: Merge "docs: Update auto landing and design page ↵Luan Nguyen2015-03-1040-36/+34
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | image assets" into lmp-docs * commit '24b4e5729ed917dc2831a111f917d0a5fbd4e4d0': docs: Update auto landing and design page image assets
| | * | | | | am 0fc17c37: Merge "docs: Update auto landing and design page image assets" ↵Luan Nguyen2015-03-1040-36/+34
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '0fc17c37a514a80073631dffa381ec07caed93cf': docs: Update auto landing and design page image assets
| | | * | | | Merge "docs: Update auto landing and design page image assets" into lmp-docsLuan Nguyen2015-03-1040-36/+34
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | docs: Update auto landing and design page image assetsLuan Nguyen2015-03-0940-36/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
* | | | | | | am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions ↵Rich Slogar2015-03-112-12/+46
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update" into lmp-docs * commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2': docs: eclipse revisions update
| * | | | | | am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docsRich Slogar2015-03-102-12/+46
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '08ddf132bfb2117d49ea3ca70861a227c39e8115': docs: eclipse revisions update
| | * | | | | am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docsRich Slogar2015-03-102-12/+46
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774': docs: eclipse revisions update
| | | * | | | Merge "docs: eclipse revisions update" into lmp-docsRich Slogar2015-03-102-12/+46
| | | |\ \ \ \
| | | | * | | | docs: eclipse revisions updateRich Slogar2015-03-102-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
* | | | | | | | am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing ↵Andrew Solovay2015-03-111-126/+245
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Messaging for Auto" * commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd': docs: Revisions to "Providing Messaging for Auto"
| * | | | | | am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"Andrew Solovay2015-03-101-126/+245
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '66b4b3179b0b98e89daaacf0e4d926c72341ea6a': docs: Revisions to "Providing Messaging for Auto"
| | * | | | | am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"Andrew Solovay2015-03-101-126/+245
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00': docs: Revisions to "Providing Messaging for Auto"
| | | * | | | docs: Revisions to "Providing Messaging for Auto"Andrew Solovay2015-03-091-126/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a workflow section and "important classes", and tightened up the rest of the doc to (hopefully) make it all clearer. See first comment for doc stage location. Change-Id: Ifa8db66768a096ae1059ddf17760fee8d74c7c6e
* | | | | | | Merge "docs: build tools revision 22.0.0:" into lmp-mr1-devRich Slogar2015-03-091-1/+23
|\ \ \ \ \ \ \
| * | | | | | | docs: build tools revision 22.0.0:Rich Slogar2015-03-091-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
* | | | | | | | am 00e3efb5: am f51020ea: am 6e1cbe43: Merge "docs: android plugin for ↵Rich Slogar2015-03-091-1/+30
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gradle release 1.1.3 release notes" into lmp-docs * commit '00e3efb549274ac381c95e359611ce7dcc9542cc': docs: android plugin for gradle release 1.1.3 release notes
| * | | | | | | am f51020ea: am 6e1cbe43: Merge "docs: android plugin for gradle release ↵Rich Slogar2015-03-091-1/+30
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.1.3 release notes" into lmp-docs * commit 'f51020eaaaff9f54cee1ba91ab35d0212ddb0f54': docs: android plugin for gradle release 1.1.3 release notes
| | * | | | | | am 6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release ↵Rich Slogar2015-03-091-1/+30
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notes" into lmp-docs * commit '6e1cbe43957b18f471f82682b5df999578230230': docs: android plugin for gradle release 1.1.3 release notes
| | | * | | | | Merge "docs: android plugin for gradle release 1.1.3 release notes" into ↵Rich Slogar2015-03-091-1/+30
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs
| | | | * | | | | docs: android plugin for gradle release 1.1.3 release notesRich Slogar2015-03-061-1/+30
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
* | | | | | | | am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear ↵Luan Nguyen2015-03-094-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index page" into lmp-docs * commit 'a9639fe619591888fcc97475de15a55017dd1ff7': docs: Add new partners to Wear index page
| * | | | | | | am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" ↵Luan Nguyen2015-03-094-0/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '2fcc438f765789e1786cdfe612f61b034ad7344b': docs: Add new partners to Wear index page
| | * | | | | | am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a96a77814a89836ba0a85335479c6b3ea9aec33': docs: Add new partners to Wear index page
| | | * | | | | Merge "docs: Add new partners to Wear index page" into lmp-docsLuan Nguyen2015-03-094-0/+9
| | | |\ \ \ \ \
| | | | * | | | | docs: Add new partners to Wear index pageLuan Nguyen2015-03-034-0/+9
| | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | bug: 19550254 Change-Id: If5f4722ff480e965cce998bd6383d3a2df0cfe0d
* | | | | | | | am a2d342e3: am beed9332: am 0bceaacf: Merge "Reworking geofencing training ↵Eric Gilmore2015-03-065-1300/+209
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to new API and sample." into lmp-docs * commit 'a2d342e374b6c3152695ad0761a2bdb96be2d8c4': Reworking geofencing training to new API and sample.
| * | | | | | | am beed9332: am 0bceaacf: Merge "Reworking geofencing training to new API ↵Eric Gilmore2015-03-065-1300/+209
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and sample." into lmp-docs * commit 'beed93320633a0c460952eaa91a61a1d186e390a': Reworking geofencing training to new API and sample.
| | * | | | | | am 0bceaacf: Merge "Reworking geofencing training to new API and sample." ↵Eric Gilmore2015-03-065-1300/+209
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '0bceaacf4221a5b302d12fc085744bb54cbbdd6e': Reworking geofencing training to new API and sample.
| | | * | | | | Merge "Reworking geofencing training to new API and sample." into lmp-docsEric Gilmore2015-03-065-1300/+209
| | | |\ \ \ \ \
generated by cgit v1.1 at 2025-02-03 15:01:18 +0000