OSDN Git Service
Jon Larimer [Thu, 29 Jan 2015 18:09:27 +0000 (18:09 +0000)]
am
7ab0ac69: (-s ours) am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '
7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:02:27 +0000 (18:02 +0000)]
am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '
64d6bacf13e4ae913c52b773439a542dc5b2b714':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 17:55:10 +0000 (17:55 +0000)]
am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '
2f4ad45d60aac5b2b025e9eac34e289d406645dc':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
Dirk Dougherty [Thu, 29 Jan 2015 00:24:39 +0000 (00:24 +0000)]
am
49738792: Doc change: Update Ads terms language.
* commit '
497387928d53cca060c3f43b3a9f5c7834564333':
Doc change: Update Ads terms language.
Dirk Dougherty [Thu, 6 Nov 2014 18:58:06 +0000 (10:58 -0800)]
Doc change: Update Ads terms language.
Change-Id: I57cf037229f966f52c20c05f6ac29cc6774b1643
Leon Scroggins III [Wed, 28 Jan 2015 18:23:47 +0000 (18:23 +0000)]
Leon Scroggins III [Wed, 28 Jan 2015 17:39:52 +0000 (17:39 +0000)]
am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
automerge:
1e0d4b5
* commit '
1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
Handle bad ninepatch data.
Joe Fernandez [Tue, 27 Jan 2015 23:03:49 +0000 (23:03 +0000)]
am
05defb99: Merge "docs: plugin for gradle typo" into lmp-docs
* commit '
05defb992eefb8a32742d64c06e8e8fd02dbf670':
docs: plugin for gradle typo
Joe Fernandez [Tue, 27 Jan 2015 22:57:29 +0000 (22:57 +0000)]
Merge "docs: plugin for gradle typo" into lmp-docs
Leon Scroggins III [Tue, 27 Jan 2015 22:55:00 +0000 (22:55 +0000)]
am
1e0d4b56: am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
1dbbc2045ae16a4923b30c9576703d02a4363529':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
6106f6a490cb5816602e8e3ae84a5c653dda44d3':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
9352296810926eae663477526545a55e1b1f7a27':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
01287549ad415c51377683696eb37c362d43061a':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am
9a6143fa: Handle bad ninepatch data.
* commit '
9a6143fab7d93797e4b22a12b89e07c160e5c31d':
Handle bad ninepatch data.
Ricardo Cervera [Tue, 27 Jan 2015 21:16:53 +0000 (21:16 +0000)]
am
de113066: docs: Transitions training class.
* commit '
de113066d80c3f19979eb531484af73f64640de9':
docs: Transitions training class.
Ricardo Cervera [Mon, 12 Jan 2015 20:45:54 +0000 (12:45 -0800)]
docs: Transitions training class.
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.
Changes proposed by Ben Hawkes of Google Project Zero.
NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.
ResourceTypes.h:
Store ninepatch values as unsigned.
BUG:
19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit
a730ef3f77fc495bc90199b4d45efab26d609782)
Sarah Maddox [Mon, 26 Jan 2015 20:23:25 +0000 (20:23 +0000)]
am
912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
* commit '
912cacde8619d28ea1d4a3f6ebf30be1c8a5d47a':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Sarah Maddox [Mon, 26 Jan 2015 20:12:21 +0000 (20:12 +0000)]
Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs
Ricardo Cervera [Mon, 26 Jan 2015 19:39:48 +0000 (19:39 +0000)]
am
edb7a442: Merge "docs: Wear DataItem listener improvements" into lmp-docs
* commit '
edb7a4420bfbf3e7f9efc06718b45c56bbd3dc2d':
docs: Wear DataItem listener improvements
Ricardo Cervera [Mon, 26 Jan 2015 19:32:12 +0000 (19:32 +0000)]
Merge "docs: Wear DataItem listener improvements" into lmp-docs
Sarah Maddox [Sun, 30 Nov 2014 22:08:26 +0000 (09:08 +1100)]
docs: Adds new geocoding sample to Location API training.
Uses GoogleApiClient to connect to Play services.
Uses the latest Fused Location Provider API.
Bug:
17109822
Change-Id: I96dbf348e9ae41dbbeb075e6540620afc304d3b6
Rich Slogar [Fri, 23 Jan 2015 17:56:50 +0000 (09:56 -0800)]
docs: plugin for gradle typo
b/
19106103
Change-Id: I3db503ccd5a93ee0a3bdf6dfb8c76f7391a5e75e
Ricardo Cervera [Thu, 22 Jan 2015 17:56:54 +0000 (17:56 +0000)]
am
bdfcd56e: Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
* commit '
bdfcd56e7f01b7bb1f50c932792b9528c67892e5':
docs: Fixes to the watch faces design guidelines
Ricardo Cervera [Thu, 22 Jan 2015 17:50:47 +0000 (17:50 +0000)]
Merge "docs: Fixes to the watch faces design guidelines" into lmp-docs
Ricardo Cervera [Wed, 14 Jan 2015 16:29:38 +0000 (08:29 -0800)]
docs: Fixes to the watch faces design guidelines
Bug:
19001253
Change-Id: I356b887de71710afa27acc7544d0efdc3a857e91
Luan Nguyen [Thu, 22 Jan 2015 17:29:30 +0000 (17:29 +0000)]
am
1dd76ea2: docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
* commit '
1dd76ea2760f84496a5b82435fc35d7c28a6dd6d':
docs: Fix companion configuration (
18864041) Fix declaration of var and incorrect method call (
18617393)
Luan Nguyen [Wed, 21 Jan 2015 23:16:36 +0000 (15:16 -0800)]
docs: Fix companion configuration (
18864041)
Fix declaration of var and incorrect method call (
18617393)
bug:
18864041
bug:
18617393
Change-Id: Ic31e44acfe7338f56acdbbd97ba8cc1e87042b53
Andrew Solovay [Wed, 21 Jan 2015 23:10:59 +0000 (23:10 +0000)]
am
78f4342f: Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
* commit '
78f4342fac982a130a62dac2a459cef2a4c29f5a':
docs: WebView security notes for apps on pre-K devices
Luan Nguyen [Wed, 21 Jan 2015 23:10:55 +0000 (23:10 +0000)]
am
f082f898: Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
* commit '
f082f8980e742e9a60aeb91271caff38e10cf0a8':
docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171).
Andrew Solovay [Wed, 21 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "docs: WebView security notes for apps on pre-K devices" into lmp-docs
Ricardo Cervera [Tue, 20 Jan 2015 21:41:56 +0000 (13:41 -0800)]
docs: Wear DataItem listener improvements
Change-Id: I07bf2ab063556dd4f6e42a5835f73dd5b326d26e
Luan Nguyen [Wed, 21 Jan 2015 16:19:18 +0000 (16:19 +0000)]
Merge "docs: Fix conditional in ambient mode check method (
18832168). Fix issue with non existent variable (
18832287). Fix issue with outdated instructions (
18832293). Fix issue with misleading time tick (
18832171)." into lmp-docs
Luan Nguyen [Tue, 20 Jan 2015 16:41:51 +0000 (08:41 -0800)]
docs: Fix conditional in ambient mode check method (
18832168).
Fix issue with non existent variable (
18832287).
Fix issue with outdated instructions (
18832293).
Fix issue with misleading time tick (
18832171).
bug:
18832168
bug:
18832171
bug:
18832287
bug:
18832293
Change-Id: I4f071846589ba7edda500342ccd5fac6ecca3161
Andrew Solovay [Tue, 20 Jan 2015 23:47:31 +0000 (15:47 -0800)]
docs: WebView security notes for apps on pre-K devices
Added paragraph describing security precautions for apps that use
WebView on devices running versions older than Android 4.4. See first
comment for doc stage location.
bug:
19075466
Change-Id: I69937d8dfc37ec1ba693f969500b9dc7404c4635
Ricardo Cervera [Tue, 20 Jan 2015 18:03:50 +0000 (18:03 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256 automerge:
e8f6bd4
automerge:
eada048
* commit '
eada048addc14a95ced54b17c6a75f5f899e2c2a':
Ricardo Cervera [Tue, 20 Jan 2015 17:57:45 +0000 (17:57 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
automerge:
e8f6bd4
* commit '
e8f6bd484627e16fa2fd9509b0f06056ee44be94':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Scott Rowe [Sat, 17 Jan 2015 02:28:51 +0000 (02:28 +0000)]
am
c987ca05: Merge "docs: removing code captions" into lmp-docs
* commit '
c987ca05010a8cc06572d5b04c93fb6404f8bf45':
docs: removing code captions
Scott Rowe [Sat, 17 Jan 2015 02:28:47 +0000 (02:28 +0000)]
am
ab18d6c8: Merge "docs: Add screenshot" into lmp-docs
* commit '
ab18d6c82eb92732ef7ab54adffcd27faffd0c57':
docs: Add screenshot
Scott Rowe [Sat, 17 Jan 2015 01:31:52 +0000 (01:31 +0000)]
Merge "docs: removing code captions" into lmp-docs
Scott Rowe [Sat, 17 Jan 2015 01:31:13 +0000 (01:31 +0000)]
Merge "docs: Add screenshot" into lmp-docs
David Friedman [Sat, 17 Jan 2015 00:30:18 +0000 (00:30 +0000)]
am
fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit '
fa66fdd57a494bed0a92d9fb0aadf332395f371f':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
David Friedman [Sat, 17 Jan 2015 00:23:29 +0000 (00:23 +0000)]
Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
David Friedman [Wed, 19 Nov 2014 21:03:45 +0000 (13:03 -0800)]
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Change-Id: I6555b9894a9ae4dc9365f21b40a75627fb7ed63f
Quddus Chong [Fri, 16 Jan 2015 22:21:34 +0000 (22:21 +0000)]
am
de0a8700: Merge "docs: Fixed typos in Game Controller training code snippets. bug:
17959906" into lmp-docs
* commit '
de0a87007b987a76af2ddd526dd473ad83fbb74b':
docs: Fixed typos in Game Controller training code snippets. bug:
17959906
Joe Fernandez [Fri, 16 Jan 2015 22:15:25 +0000 (22:15 +0000)]
am
217d145d: Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
* commit '
217d145d49940d28a3c5914d94ce2e56f243301b':
docs: adding studio-sample-in-editor.png file
Ricardo Cervera [Fri, 16 Jan 2015 22:15:21 +0000 (22:15 +0000)]
am
e229751d: docs: Add browseable Wearable Support Lib Javadoc
* commit '
e229751d11692ede7fed3b56472f2d020767b412':
docs: Add browseable Wearable Support Lib Javadoc
Quddus Chong [Fri, 16 Jan 2015 22:03:31 +0000 (22:03 +0000)]
Merge "docs: Fixed typos in Game Controller training code snippets. bug:
17959906" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 21:58:36 +0000 (21:58 +0000)]
Merge "docs: adding studio-sample-in-editor.png file" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 20:26:20 +0000 (12:26 -0800)]
docs: adding studio-sample-in-editor.png file
Change-Id: I8b200eeb5134e9c66cb198f06ccfaa78a7f6a505
Quddus Chong [Fri, 16 Jan 2015 19:35:07 +0000 (11:35 -0800)]
docs: Fixed typos in Game Controller training code snippets.
bug:
17959906
Change-Id: I2fa1b01704a69536b3d27fe6aa96c441d7f8fb27
Ricardo Cervera [Tue, 13 Jan 2015 18:04:04 +0000 (10:04 -0800)]
docs: Add browseable Wearable Support Lib Javadoc
Change-Id: Ied1f25f637c529046b0adc1e1ea173a290b22da1
Joe Fernandez [Fri, 16 Jan 2015 18:56:25 +0000 (18:56 +0000)]
am
8304b8b9: Merge "docs: studio disk space requirements typo" into lmp-docs
* commit '
8304b8b9ceae4c35ddf4ae80b552127e5ed77ce4':
docs: studio disk space requirements typo
Joe Fernandez [Fri, 16 Jan 2015 18:52:12 +0000 (18:52 +0000)]
am
c84021ba: Merge "docs: link to sdk manager" into lmp-docs
* commit '
c84021ba99d9326b016120a1d7aab4ee551bcce9':
docs: link to sdk manager
Ricardo Cervera [Fri, 16 Jan 2015 18:52:08 +0000 (18:52 +0000)]
am
97c4ba98: docs: Added info on noHistory and onActivityResult().
* commit '
97c4ba9862006e2c9f4cea07f55dc7120d305e5a':
docs: Added info on noHistory and onActivityResult().
Joe Fernandez [Fri, 16 Jan 2015 18:49:27 +0000 (18:49 +0000)]
Merge "docs: studio disk space requirements typo" into lmp-docs
Joe Fernandez [Fri, 16 Jan 2015 18:47:51 +0000 (18:47 +0000)]
Merge "docs: link to sdk manager" into lmp-docs
Ricardo Cervera [Fri, 16 Jan 2015 17:54:30 +0000 (09:54 -0800)]
resolved conflicts for merge of
e8f6bd48 to lmp-dev
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult().
Bug:
13807256
Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83
Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
98f07d901492335f51258655fbfa032fa3f2d58e':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
92f6a747085b4b5ed692de4bdb0050c096eae393':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Rich Slogar [Fri, 16 Jan 2015 00:43:56 +0000 (00:43 +0000)]
Merge "docs: studio support library revisions update" into lmp-docs
Dirk Dougherty [Fri, 16 Jan 2015 00:41:55 +0000 (00:41 +0000)]
Merge "Doc change: Add new analytics information to Distribute." into lmp-docs
Dirk Dougherty [Fri, 12 Dec 2014 19:51:13 +0000 (11:51 -0800)]
Doc change: Add new analytics information to Distribute.
Change-Id: I0ce5c457469cc2628dad8a1b7254fc9068babc84
Rich Slogar [Fri, 16 Jan 2015 00:27:49 +0000 (00:27 +0000)]
Merge "docs: build link update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:27:00 +0000 (00:27 +0000)]
Merge "docs: Plugin reference update" into lmp-docs
Rich Slogar [Fri, 16 Jan 2015 00:26:38 +0000 (00:26 +0000)]
Merge "docs: studio sample procedure update" into lmp-docs
Rich Slogar [Thu, 11 Dec 2014 23:51:18 +0000 (15:51 -0800)]
docs: studio support library revisions update
Change-Id: I9df9ffbcbb99e8b661ee5b67ac0efe28d6d19b4b
Luan Nguyen [Thu, 15 Jan 2015 17:24:09 +0000 (09:24 -0800)]
docs: Remove reference to handheld app for bitmap resource locations.
bug:
17577838
Change-Id: I54cfd7a73d21464077d8644bbe1a2d8896f745e6
Todd Kennedy [Wed, 14 Jan 2015 23:40:46 +0000 (15:40 -0800)]
DO NOT MERGE Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.
Cherry picked from lmp. Fixes bug
15989465.
Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
Scott Rowe [Mon, 12 Jan 2015 23:28:04 +0000 (15:28 -0800)]
docs: removing code captions
Change-Id: Ifbeedf014741ff680640e1bdd0b35fa2d68f9e45
Ricardo Cervera [Tue, 13 Jan 2015 16:35:04 +0000 (16:35 +0000)]
am
f5569413: docs: Fix broken link in Common Intents
* commit '
f556941357ea391cae6dcd2e22b71a837a216d06':
docs: Fix broken link in Common Intents
Ricardo Cervera [Tue, 13 Jan 2015 16:28:22 +0000 (08:28 -0800)]
docs: Fix broken link in Common Intents
Bug:
18991366
Change-Id: I998e5213bb7117ebd26ab335206f430f60d1c537
Scott Rowe [Mon, 5 Jan 2015 21:35:46 +0000 (13:35 -0800)]
docs: Add screenshot
Change-Id: I0995d23e1df30ce17ce381c14a6cbd2de389c396
Ricardo Cervera [Mon, 12 Jan 2015 21:53:27 +0000 (21:53 +0000)]
am
d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
* commit '
d8bd117ce017d7e9b967d7949f8ca3e661e2cd39':
docs: Add parent calls to WatchFaces snippet.
Ricardo Cervera [Mon, 12 Jan 2015 21:49:21 +0000 (21:49 +0000)]
Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:27:24 +0000 (21:27 +0000)]
am
8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
* commit '
8062f1f34113f4d73d37ebb57245342cca9d8f9c':
docs: Removing obsolete L-Preview docs and images
Joe Fernandez [Mon, 12 Jan 2015 21:23:16 +0000 (21:23 +0000)]
Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs
Joe Fernandez [Mon, 12 Jan 2015 21:16:26 +0000 (21:16 +0000)]
am
76110e7c: docs: Remove Wear preview reference docs
* commit '
76110e7c46297a221d8f2c92fbaef46b6f405294':
docs: Remove Wear preview reference docs
Ricardo Cervera [Mon, 12 Jan 2015 20:54:32 +0000 (12:54 -0800)]
docs: Add parent calls to WatchFaces snippet.
Bug:
18982021
Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
Joe Fernandez [Mon, 12 Jan 2015 18:28:03 +0000 (10:28 -0800)]
docs: Remove Wear preview reference docs
These docs are out of date and unreachable due to redirect rules.
Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
Joe Fernandez [Mon, 12 Jan 2015 18:20:41 +0000 (10:20 -0800)]
docs: Removing obsolete L-Preview docs and images
- /preview/images/
- TV Preview index pages
- Notifications preview page
Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
Eric Gilmore [Mon, 12 Jan 2015 17:07:12 +0000 (17:07 +0000)]
am
fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs
* commit '
fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
Adding Android Fundamentals video.
Eric Gilmore [Mon, 12 Jan 2015 17:02:30 +0000 (17:02 +0000)]
Merge "Adding Android Fundamentals video." into lmp-docs
Eric Gilmore [Mon, 12 Jan 2015 16:26:43 +0000 (16:26 +0000)]
am
6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs
* commit '
6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
Deepanshu Gupta [Sat, 10 Jan 2015 09:49:53 +0000 (09:49 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar. automerge:
bb600de
automerge:
8d9361a
* commit '
8d9361a4ec1260b268865af6dcc8b2c5bb316f9d':
Deepanshu Gupta [Sat, 10 Jan 2015 09:48:39 +0000 (09:48 +0000)]
Support Locale.toLanguageTag on Java 6 automerge:
dbd64f7
automerge:
7da2b5d
* commit '
7da2b5dbc259ef026bb075905f9fda3695dd4615':
Deepanshu Gupta [Sat, 10 Jan 2015 09:47:08 +0000 (09:47 +0000)]
LayoutLib: Fix System.arraycopy() automerge:
51fb775
automerge:
55c7bd4
* commit '
55c7bd4dac3078ab220823e522c9257246933c46':
Deepanshu Gupta [Sat, 10 Jan 2015 04:59:11 +0000 (04:59 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
automerge:
bb600de
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 04:57:42 +0000 (04:57 +0000)]
Support Locale.toLanguageTag on Java 6
automerge:
dbd64f7
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 04:56:36 +0000 (04:56 +0000)]
LayoutLib: Fix System.arraycopy()
automerge:
51fb775
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:05 +0000 (03:51 +0000)]
am
bb600de6: am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 03:51:01 +0000 (03:51 +0000)]
am
dbd64f7c: (-s ours) Support Locale.toLanguageTag on Java 6
* commit '
dbd64f7c904287f9e1bf5bb22385aace85274cab':
Support Locale.toLanguageTag on Java 6
Deepanshu Gupta [Sat, 10 Jan 2015 03:43:48 +0000 (03:43 +0000)]
am
51fb7754: (-s ours) LayoutLib: Fix System.arraycopy()
* commit '
51fb7754fc9a232a225b31b37219f4b0dcba6711':
LayoutLib: Fix System.arraycopy()
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am
8505c387: Special case AppCompat to show action bar.
* commit '
8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit
5cd9dde5a2a77c5095f985186d8f03147fd22870)
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.
Note that this was already being done for char.
Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit
e1960cc0b541cda93db94de5bef42dff922b9ec3)