OSDN Git Service
Deepanshu Gupta [Thu, 12 Mar 2015 00:53:12 +0000 (00:53 +0000)]
am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
71ba12308e338595d8068ff788bb5c8abfcfe515':
Fix cyclic dependency in BlendComposite and BlendingMode.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:14 +0000 (00:46 +0000)]
am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit '
b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
Fix rare NPE in BridgeContext.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:10 +0000 (00:46 +0000)]
am
71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit '
71518174fcd57c85d1e38f1794c44b763baff286':
Fix project settings.
Deepanshu Gupta [Thu, 12 Mar 2015 00:46:07 +0000 (00:46 +0000)]
am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit '
b171be1a54a6a0fe416916ff91e41362b8bb4873':
Add RecyclerView support.
Deepanshu Gupta [Thu, 12 Mar 2015 00:45:40 +0000 (00:45 +0000)]
am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
efc09c644fa4e8354d54485aab6c0b18868284eb':
Fix cyclic dependency in BlendComposite and BlendingMode.
Quddus Chong [Thu, 12 Mar 2015 00:41:08 +0000 (00:41 +0000)]
am
77eb85e1: am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
77eb85e14fb37a67af2eaf120e1c866dee64ad2c':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Deepanshu Gupta [Thu, 12 Mar 2015 00:38:45 +0000 (00:38 +0000)]
am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '
78660423900fa255cc83b85320e98d5184be393b':
Fix cyclic dependency in BlendComposite and BlendingMode.
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:45 +0000 (00:32 +0000)]
Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:32:22 +0000 (00:32 +0000)]
Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:52 +0000 (00:31 +0000)]
Merge "Fix project settings." into lmp-mr1-dev
Deepanshu Gupta [Thu, 12 Mar 2015 00:31:49 +0000 (00:31 +0000)]
Merge "Add RecyclerView support." into lmp-mr1-dev
Deepanshu Gupta [Wed, 11 Mar 2015 23:34:13 +0000 (16:34 -0700)]
Fix cyclic dependency in BlendComposite and BlendingMode.
Introduced in commit
1a10ca7e526736b4fd143f7c9f3b29643c0062a4
Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
Quddus Chong [Wed, 11 Mar 2015 23:30:58 +0000 (23:30 +0000)]
am
c706a980: am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
c706a980e426ea0e0b6aaee5530516b1a16c3755':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:24:37 +0000 (23:24 +0000)]
am
a236a49e: am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
a236a49edec87cd24fe683550c0ab83be3dcbf07':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:16:59 +0000 (23:16 +0000)]
am
47426f1c: Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
* commit '
47426f1c190b17548eabb50fad3945844f1a7363':
docs: Added overview page and Javadocs for the Android Testing Support Library.
Quddus Chong [Wed, 11 Mar 2015 23:11:02 +0000 (23:11 +0000)]
Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs
Quddus Chong [Fri, 27 Feb 2015 00:38:46 +0000 (16:38 -0800)]
docs: Added overview page and Javadocs for the Android Testing Support Library.
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
Deepanshu Gupta [Wed, 11 Mar 2015 22:41:47 +0000 (15:41 -0700)]
Fix rare NPE in BridgeContext.
Also fixed some deprecation warnings.
Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
Luan Nguyen [Wed, 11 Mar 2015 19:13:06 +0000 (19:13 +0000)]
am
dd7d025b: am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
dd7d025b97aa09723f1695f23b85d1d926cb7ea1':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 19:07:52 +0000 (19:07 +0000)]
am
ca0db1a0: am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
ca0db1a0ec0fc0456ec4180d7b0bbac7e43dffec':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 17:31:34 +0000 (17:31 +0000)]
am
50a9b835: am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
50a9b83554decb4913fc8eac9862edf902149265':
docs: Update auto landing and design page image assets
Rich Slogar [Wed, 11 Mar 2015 17:31:30 +0000 (17:31 +0000)]
am
8ab872db: am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
8ab872dba1eff1477cb12da63d1f882260a271ae':
docs: eclipse revisions update
Andrew Solovay [Wed, 11 Mar 2015 17:31:26 +0000 (17:31 +0000)]
am
a493c489: am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
a493c48989f3c80dd061b86a6216a622b20dfc7f':
docs: Revisions to "Providing Messaging for Auto"
Luan Nguyen [Wed, 11 Mar 2015 17:18:43 +0000 (17:18 +0000)]
am
42ee70aa: am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
42ee70aac023da26a6dc4dee5856871372e792e8':
docs: Update auto landing and design page image assets
Rich Slogar [Wed, 11 Mar 2015 17:18:39 +0000 (17:18 +0000)]
am
dcc5a34b: am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
docs: eclipse revisions update
Andrew Solovay [Wed, 11 Mar 2015 17:18:23 +0000 (17:18 +0000)]
am
5f8e08ed: am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
docs: Revisions to "Providing Messaging for Auto"
Luan Nguyen [Wed, 11 Mar 2015 16:42:52 +0000 (16:42 +0000)]
am
eeb79d10: am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
eeb79d104fc09ea727108bde7a7ef06f3300241a':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 16:35:32 +0000 (16:35 +0000)]
am
9a7238d8: Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
* commit '
9a7238d8f5bd4ec90c2b887808ea26e5f55d0154':
Revert "docs: Update auto landing and design page image assets"
Luan Nguyen [Wed, 11 Mar 2015 16:25:32 +0000 (16:25 +0000)]
Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs
Luan Nguyen [Wed, 11 Mar 2015 16:20:52 +0000 (16:20 +0000)]
Revert "docs: Update auto landing and design page image assets"
This reverts commit
7859590acd229b66c1953d3d4ed9538261d6b898.
Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
Deepanshu Gupta [Wed, 11 Mar 2015 01:15:30 +0000 (18:15 -0700)]
Fix project settings.
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.
Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
Deepanshu Gupta [Fri, 6 Mar 2015 02:38:37 +0000 (18:38 -0800)]
Add RecyclerView support.
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
Luan Nguyen [Tue, 10 Mar 2015 19:28:57 +0000 (19:28 +0000)]
am
24b4e572: am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
24b4e5729ed917dc2831a111f917d0a5fbd4e4d0':
docs: Update auto landing and design page image assets
Rich Slogar [Tue, 10 Mar 2015 19:28:53 +0000 (19:28 +0000)]
am
08ddf132: am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
08ddf132bfb2117d49ea3ca70861a227c39e8115':
docs: eclipse revisions update
Luan Nguyen [Tue, 10 Mar 2015 19:22:37 +0000 (19:22 +0000)]
am
0fc17c37: Merge "docs: Update auto landing and design page image assets" into lmp-docs
* commit '
0fc17c37a514a80073631dffa381ec07caed93cf':
docs: Update auto landing and design page image assets
Rich Slogar [Tue, 10 Mar 2015 19:22:33 +0000 (19:22 +0000)]
am
0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '
0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
docs: eclipse revisions update
Pavel Zhamaitsiak [Tue, 10 Mar 2015 19:22:16 +0000 (19:22 +0000)]
Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev
Luan Nguyen [Tue, 10 Mar 2015 19:18:53 +0000 (19:18 +0000)]
Merge "docs: Update auto landing and design page image assets" into lmp-docs
Rich Slogar [Tue, 10 Mar 2015 19:15:00 +0000 (19:15 +0000)]
Merge "docs: eclipse revisions update" into lmp-docs
Rich Slogar [Thu, 5 Mar 2015 00:56:22 +0000 (16:56 -0800)]
docs: eclipse revisions update
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
Andrew Solovay [Tue, 10 Mar 2015 15:11:01 +0000 (15:11 +0000)]
am
66b4b317: am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
docs: Revisions to "Providing Messaging for Auto"
Rich Slogar [Tue, 10 Mar 2015 03:08:58 +0000 (03:08 +0000)]
am
464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '
464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
docs: build tools revision 22.0.0:
Andrew Solovay [Tue, 10 Mar 2015 01:29:29 +0000 (01:29 +0000)]
am
0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '
0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
docs: Revisions to "Providing Messaging for Auto"
Rich Slogar [Mon, 9 Mar 2015 23:42:38 +0000 (23:42 +0000)]
Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:09:18 +0000 (16:09 -0800)]
Add strings for IMS Registration error notifications.
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
Luan Nguyen [Thu, 5 Mar 2015 18:38:32 +0000 (10:38 -0800)]
docs: Update auto landing and design page image assets
Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
Rich Slogar [Mon, 9 Mar 2015 19:54:48 +0000 (19:54 +0000)]
am
5a604b35: am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
5a604b359cd487d4a01a397e49117d22848e6809':
docs: android plugin for gradle release 1.1.3 release notes
Andrew Solovay [Wed, 26 Nov 2014 00:20:51 +0000 (16:20 -0800)]
docs: Revisions to "Providing Messaging for Auto"
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
Rich Slogar [Mon, 9 Mar 2015 19:47:18 +0000 (19:47 +0000)]
am
00e3efb5: am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
00e3efb549274ac381c95e359611ce7dcc9542cc':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:40:48 +0000 (19:40 +0000)]
am
f51020ea: am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
f51020eaaaff9f54cee1ba91ab35d0212ddb0f54':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:34:32 +0000 (19:34 +0000)]
am
6e1cbe43: Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
* commit '
6e1cbe43957b18f471f82682b5df999578230230':
docs: android plugin for gradle release 1.1.3 release notes
Rich Slogar [Mon, 9 Mar 2015 19:29:36 +0000 (19:29 +0000)]
Merge "docs: android plugin for gradle release 1.1.3 release notes" into lmp-docs
Rich Slogar [Tue, 3 Mar 2015 02:11:33 +0000 (18:11 -0800)]
docs: build tools revision 22.0.0:
Change-Id: Idcc00e2fb0f30c54f28ad0c12c6fb014df681e76
Luan Nguyen [Mon, 9 Mar 2015 17:17:04 +0000 (17:17 +0000)]
am
ea9308cf: am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
ea9308cf6b95858ef4f16222ebb8809621b801ae':
docs: Add new partners to Wear index page
Etan Cohen [Mon, 9 Mar 2015 17:08:49 +0000 (10:08 -0700)]
Update documentation of IImsConfig interface.
Change-Id: Id176c131e0192a2ebb4dd73e902c2a893feebcdc
Luan Nguyen [Mon, 9 Mar 2015 15:05:44 +0000 (15:05 +0000)]
am
a9639fe6: am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
a9639fe619591888fcc97475de15a55017dd1ff7':
docs: Add new partners to Wear index page
Luan Nguyen [Mon, 9 Mar 2015 14:59:12 +0000 (14:59 +0000)]
am
2fcc438f: am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
2fcc438f765789e1786cdfe612f61b034ad7344b':
docs: Add new partners to Wear index page
Luan Nguyen [Mon, 9 Mar 2015 14:52:45 +0000 (14:52 +0000)]
am
6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '
6a96a77814a89836ba0a85335479c6b3ea9aec33':
docs: Add new partners to Wear index page
Luan Nguyen [Mon, 9 Mar 2015 14:47:31 +0000 (14:47 +0000)]
Merge "docs: Add new partners to Wear index page" into lmp-docs
Pavel Zhamaitsiak [Sat, 7 Mar 2015 00:32:35 +0000 (00:32 +0000)]
Merge "IMS: Support for IMS Registration error codes" into lmp-mr1-wfc-dev
Rich Slogar [Sat, 7 Mar 2015 00:12:26 +0000 (16:12 -0800)]
docs: android plugin for gradle release 1.1.3 release notes
Change-Id: If7ee333e83e0be60c864021e068f024694eb3dd1
Rekha Kumar [Tue, 24 Feb 2015 19:45:36 +0000 (11:45 -0800)]
IMS: Support for IMS Registration error codes
- Add support for propagation of IMS Registration errors
- Add reason type - operator specific
- Add call drop reason type and error code CD-04 that specifies there was no
qualified LTE network to handover to from a wifi call
Change-Id: Ib9c93dfafe8d8fbdece3a5daf6fd13ef0c16f158
Eric Gilmore [Fri, 6 Mar 2015 19:40:07 +0000 (19:40 +0000)]
am
39d47c7c: am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
39d47c7c709cd2417f8a0a7849ed6da8eb83caa3':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:33:51 +0000 (19:33 +0000)]
am
a2d342e3: am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
a2d342e374b6c3152695ad0761a2bdb96be2d8c4':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:27:14 +0000 (19:27 +0000)]
am
beed9332: am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
beed93320633a0c460952eaa91a61a1d186e390a':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:20:45 +0000 (19:20 +0000)]
am
0bceaacf: Merge "Reworking geofencing training to new API and sample." into lmp-docs
* commit '
0bceaacf4221a5b302d12fc085744bb54cbbdd6e':
Reworking geofencing training to new API and sample.
Eric Gilmore [Fri, 6 Mar 2015 19:14:27 +0000 (19:14 +0000)]
Merge "Reworking geofencing training to new API and sample." into lmp-docs
Eric Gilmore [Fri, 30 Jan 2015 00:21:43 +0000 (16:21 -0800)]
Reworking geofencing training to new API and sample.
Change-Id: Ibc9e2561cd93e73eab87a78f4aabe64ae9c8a0b3
Glenn Kasten [Fri, 6 Mar 2015 16:45:14 +0000 (16:45 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:38:48 +0000 (16:38 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:32:39 +0000 (16:32 +0000)]
Glenn Kasten [Fri, 6 Mar 2015 16:25:58 +0000 (16:25 +0000)]
Glenn Kasten [Thu, 31 Jul 2014 18:11:11 +0000 (11:11 -0700)]
Fix USB typos
Change-Id: Iefa610a81e9155dcfc687c514611bb7dbba5d7f9
(cherry picked from commit
9e86f6139b62dbc87b7ea97cedf847c847657829)
Dan Sandler [Fri, 6 Mar 2015 00:10:10 +0000 (00:10 +0000)]
am
3581f4c9: Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
* commit '
3581f4c91a77ecb9313f51a2d07ed88ff61d9299':
Avoid crashing on startup when policy forbids lockscreen camera.
Dan Sandler [Fri, 6 Mar 2015 00:03:34 +0000 (00:03 +0000)]
Merge "Avoid crashing on startup when policy forbids lockscreen camera." into lmp-mr1-dev
Eric Gilmore [Thu, 5 Mar 2015 23:12:21 +0000 (23:12 +0000)]
am
636a39ba: am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
636a39babbda97743b33511b3dd2addafc8c2847':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 23:04:27 +0000 (23:04 +0000)]
am
e95fa264: am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e95fa2649b62a3fbccd096b43925a17c6ff03228':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:50:16 +0000 (22:50 +0000)]
am
e17b0a14: am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
e17b0a14ccc427bff386517537fcf23e00a087d4':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:34:58 +0000 (22:34 +0000)]
am
87499b27: Merge "Re-fixing link, and removing trailing white space." into lmp-docs
* commit '
87499b275bc7a8d4a12a3134646769a5c6c34829':
Re-fixing link, and removing trailing white space.
Eric Gilmore [Thu, 5 Mar 2015 22:00:20 +0000 (22:00 +0000)]
Merge "Re-fixing link, and removing trailing white space." into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 21:39:21 +0000 (13:39 -0800)]
Re-fixing link, and removing trailing white space.
Change-Id: Ic6cef9862424d5581cf0ad5b8366c7033a9fdd93
Rich Slogar [Thu, 5 Mar 2015 19:53:00 +0000 (19:53 +0000)]
am
bc669e3f: am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
bc669e3f555519f641102b759a04a01ac5c10cad':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:46:12 +0000 (19:46 +0000)]
am
dad1cbeb: am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
dad1cbebfabf421efc90d366d9c4fd67becf930f':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:39:47 +0000 (19:39 +0000)]
am
9f485e97: am
4aba69a8: docs: sdk tools date fix
* commit '
9f485e971e06dad399dd70712787f4c30da9515e':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:33:56 +0000 (19:33 +0000)]
am
4aba69a8: docs: sdk tools date fix
* commit '
4aba69a8a7f58541ce76429252dd0c9650b40f35':
docs: sdk tools date fix
Rich Slogar [Thu, 5 Mar 2015 19:24:45 +0000 (11:24 -0800)]
docs: sdk tools date fix
Change-Id: Ieb0a5193a5bbf7efd1e5852be4b0db421d08db14
smain@google.com [Thu, 5 Mar 2015 06:21:05 +0000 (06:21 +0000)]
am
8b2be54a: am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
8b2be54a629e4567152d8b0e6c81332632b0b877':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 06:10:54 +0000 (06:10 +0000)]
am
182059f8: am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
182059f875bedc778a3ce9710a4f634197d1e959':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 01:12:15 +0000 (01:12 +0000)]
am
ca10a435: am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
ca10a4352f07652d82da59f6c1630e8607d82dda':
add tags for wakelock and other API names
smain@google.com [Thu, 5 Mar 2015 00:59:24 +0000 (00:59 +0000)]
am
f4bbec09: Merge "add tags for wakelock and other API names" into lmp-docs
* commit '
f4bbec09a4c3795bc72d6a95aab3488c6c49ce6e':
add tags for wakelock and other API names
Eric Gilmore [Thu, 5 Mar 2015 00:55:48 +0000 (00:55 +0000)]
am
498691d2: am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
498691d2641deb1ca30938c7777a9a63882ffd87':
Fixing broken link per b/
19503824.
smain@google.com [Thu, 5 Mar 2015 00:49:48 +0000 (00:49 +0000)]
Merge "add tags for wakelock and other API names" into lmp-docs
Eric Gilmore [Thu, 5 Mar 2015 00:49:21 +0000 (00:49 +0000)]
am
62777b18: am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
62777b189dc31c250c4ae06915aae0a337950e1c':
Fixing broken link per b/
19503824.
Bart Sears [Thu, 5 Mar 2015 00:40:06 +0000 (00:40 +0000)]
am
4eedcceb: Merge "Merge commit \'
83a63bac\' into manualmerge" into lmp-mr1-dev
* commit '
4eedccebb7f4c3f9e2f1890f92bead4b9c2a9819':
Do not make ActivityContainer available to apps. DO NOT MERGE
Bart Sears [Thu, 5 Mar 2015 00:35:07 +0000 (00:35 +0000)]
Merge "Merge commit '
83a63bac' into manualmerge" into lmp-mr1-dev
John Spurlock [Wed, 4 Mar 2015 23:01:52 +0000 (23:01 +0000)]
am
c974ac11: MediaProjectionPermissionActivity: Fix NPE.
* commit '
c974ac11f808968648d26e83a0b64a7fba02ad15':
MediaProjectionPermissionActivity: Fix NPE.
John Spurlock [Tue, 24 Feb 2015 17:14:06 +0000 (12:14 -0500)]
MediaProjectionPermissionActivity: Fix NPE.
Avoid dismissing a null dialog.
Bug:
19492919
Change-Id: I6642bb5194d9818ff3db1266c7c78ed752e23ecf
(cherry picked from commit
3d332f4e67a484abe597576bf329d89655afe720)
Craig Mautner [Wed, 4 Mar 2015 18:10:34 +0000 (10:10 -0800)]
Merge commit '
83a63bac' into manualmerge
Eric Gilmore [Wed, 4 Mar 2015 17:53:31 +0000 (17:53 +0000)]
am
5c30adfd: am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
5c30adfdb6ef4b004ef0b88006660598f40eb6f5':
Fixing broken link per b/
19503824.
Eric Gilmore [Wed, 4 Mar 2015 17:47:01 +0000 (17:47 +0000)]
am
22d1c1ce: Merge "Fixing broken link per b/
19503824." into lmp-docs
* commit '
22d1c1ce1dc3c84d7517ba64a5d07b5946e49514':
Fixing broken link per b/
19503824.