160715 Commits

Author SHA1 Message Date
Rich Slogar
3a5a410bca am 0146922a: am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '0146922a6fee8af01ffd6ea201cbb6de0dbd4ed8':
  docs: build image updates
2015-03-12 00:59:36 +00:00
Deepanshu Gupta
5c69ca2b6d 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.
2015-03-12 00:53:12 +00:00
Rich Slogar
0146922a6f am 633f4829: am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '633f482907d6c9cce672341f0d0a4d6c5c2b7f78':
  docs: build image updates
2015-03-12 00:52:49 +00:00
Deepanshu Gupta
49d3c36134 am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev
* commit 'b3cfb334893a0b302cd6a0a998f27ca2e8ba7f9d':
  Fix rare NPE in BridgeContext.
2015-03-12 00:46:14 +00:00
Deepanshu Gupta
4abf0885d7 am 71518174: Merge "Fix project settings." into lmp-mr1-dev
* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.
2015-03-12 00:46:10 +00:00
Deepanshu Gupta
26f672a94c am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev
* commit 'b171be1a54a6a0fe416916ff91e41362b8bb4873':
  Add RecyclerView support.
2015-03-12 00:46:07 +00:00
Deepanshu Gupta
71ba12308e am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:45:40 +00:00
Rich Slogar
633f482907 am 7256fb4f: am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit '7256fb4fdd088cd0a827452cbdd8bd243da00881':
  docs: build image updates
2015-03-12 00:45:40 +00:00
Quddus Chong
766889e9e2 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.
2015-03-12 00:41:08 +00:00
Deepanshu Gupta
efc09c644f am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
2015-03-12 00:38:45 +00:00
Rich Slogar
7256fb4fdd am a6b0ddb7: Merge "docs: build image updates" into lmp-docs
* commit 'a6b0ddb7f1437d67538364f16dedb61f7966c653':
  docs: build image updates
2015-03-12 00:38:38 +00:00
Rich Slogar
a6b0ddb7f1 Merge "docs: build image updates" into lmp-docs 2015-03-12 00:34:10 +00:00
Deepanshu Gupta
7866042390 Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 2015-03-12 00:32:55 +00:00
Deepanshu Gupta
b3cfb33489 Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 2015-03-12 00:32:32 +00:00
Deepanshu Gupta
71518174fc Merge "Fix project settings." into lmp-mr1-dev 2015-03-12 00:31:54 +00:00
Deepanshu Gupta
b171be1a54 Merge "Add RecyclerView support." into lmp-mr1-dev 2015-03-12 00:31:50 +00:00
Deepanshu Gupta
5521f65ecb Fix cyclic dependency in BlendComposite and BlendingMode.
Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
2015-03-11 17:04:21 -07:00
Quddus Chong
77eb85e14f 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.
2015-03-11 23:30:58 +00:00
Quddus Chong
c706a980e4 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.
2015-03-11 23:24:37 +00:00
Quddus Chong
a236a49ede 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.
2015-03-11 23:16:59 +00:00
Quddus Chong
47426f1c19 Merge "docs: Added overview page and Javadocs for the Android Testing Support Library." into lmp-docs 2015-03-11 23:11:03 +00:00
Quddus Chong
489218c3ed docs: Added overview page and Javadocs for the Android Testing Support Library.
Change-Id: I645d3a302ce0d1d4cd389c6a58709a11a0426aed
2015-03-11 16:08:24 -07:00
Deepanshu Gupta
85d72c4535 Fix rare NPE in BridgeContext.
Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
2015-03-11 15:56:30 -07:00
Luan Nguyen
e32c162a40 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"
2015-03-11 19:13:06 +00:00
Luan Nguyen
dd7d025b97 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"
2015-03-11 19:07:52 +00:00
Luan Nguyen
b0422a41ed 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
2015-03-11 17:31:34 +00:00
Rich Slogar
709e9a8807 am 8ab872db: am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '8ab872dba1eff1477cb12da63d1f882260a271ae':
  docs: eclipse revisions update
2015-03-11 17:31:30 +00:00
Andrew Solovay
baf345120b am a493c489: am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit 'a493c48989f3c80dd061b86a6216a622b20dfc7f':
  docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:31:26 +00:00
Luan Nguyen
50a9b83554 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
2015-03-11 17:18:43 +00:00
Rich Slogar
8ab872dba1 am dcc5a34b: am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit 'dcc5a34b14ae09598d9c019c0d4706c5e2d00be2':
  docs: eclipse revisions update
2015-03-11 17:18:39 +00:00
Andrew Solovay
a493c48989 am 5f8e08ed: am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '5f8e08ed2c97bb92232e500e7c32b31b8bbd5dcd':
  docs: Revisions to "Providing Messaging for Auto"
2015-03-11 17:18:23 +00:00
Luan Nguyen
ca0db1a0ec 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"
2015-03-11 16:42:52 +00:00
Luan Nguyen
eeb79d104f 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"
2015-03-11 16:35:32 +00:00
Luan Nguyen
9a7238d8f5 Merge "Revert "docs: Update auto landing and design page image assets"" into lmp-docs 2015-03-11 16:25:33 +00:00
Luan Nguyen
36b8a59a6d Revert "docs: Update auto landing and design page image assets"
This reverts commit 7859590acd229b66c1953d3d4ed9538261d6b898.

Change-Id: Iab71d4a2ce0eb6dbbab685433a7c991015402e19
2015-03-11 16:20:52 +00:00
Deepanshu Gupta
7b2cae5072 Fix project settings.
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
2015-03-10 18:16:21 -07:00
Deepanshu Gupta
d345f44a87 Add RecyclerView support.
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
2015-03-10 18:16:21 -07:00
Luan Nguyen
42ee70aac0 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
2015-03-10 19:28:57 +00:00
Rich Slogar
dcc5a34b14 am 08ddf132: am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '08ddf132bfb2117d49ea3ca70861a227c39e8115':
  docs: eclipse revisions update
2015-03-10 19:28:53 +00:00
Luan Nguyen
24b4e5729e 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
2015-03-10 19:22:37 +00:00
Rich Slogar
08ddf132bf am 0c1076b2: Merge "docs: eclipse revisions update" into lmp-docs
* commit '0c1076b270bd718cab4b89acc96f6cbbbd1e9774':
  docs: eclipse revisions update
2015-03-10 19:22:33 +00:00
Pavel Zhamaitsiak
8b438c8c1a Merge "Add strings for IMS Registration error notifications." into lmp-mr1-wfc-dev 2015-03-10 19:22:17 +00:00
Luan Nguyen
0fc17c37a5 Merge "docs: Update auto landing and design page image assets" into lmp-docs 2015-03-10 19:18:54 +00:00
Rich Slogar
0c1076b270 Merge "docs: eclipse revisions update" into lmp-docs 2015-03-10 19:15:10 +00:00
Rich Slogar
05298d0fd5 docs: eclipse revisions update
Change-Id: I163f9ef9d8cd0c4e4fe5d7a19b76e239af2ee2d3
2015-03-10 11:46:49 -07:00
Andrew Solovay
5f8e08ed2c am 66b4b317: am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '66b4b3179b0b98e89daaacf0e4d926c72341ea6a':
  docs: Revisions to "Providing Messaging for Auto"
2015-03-10 15:11:01 +00:00
Rich Slogar
9462a93b05 am 464a2bc2: Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev
* commit '464a2bc261ac3b3ad817e3d5cc7fa8f3dae0a6c3':
  docs: build tools revision 22.0.0:
2015-03-10 03:08:58 +00:00
Andrew Solovay
66b4b3179b am 0a3f9c7d: docs: Revisions to "Providing Messaging for Auto"
* commit '0a3f9c7dd26ba31e75552db6ec0eb27cb7267c00':
  docs: Revisions to "Providing Messaging for Auto"
2015-03-10 01:29:29 +00:00
Rich Slogar
464a2bc261 Merge "docs: build tools revision 22.0.0:" into lmp-mr1-dev 2015-03-09 23:42:48 +00:00
Pavel Zhamaitsiak
36d96e0b1e Add strings for IMS Registration error notifications.
Change-Id: I14808e1dbbd14b5124be7303d586638b9e210269
2015-03-09 14:58:19 -07:00