OSDN Git Service
kmccormick [Thu, 19 Feb 2015 22:11:29 +0000 (22:11 +0000)]
am
bb1c03e9: am
a4fce24d: am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
bb1c03e9500e2a13044925c78a11d3c48a3a47ef':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 22:04:51 +0000 (22:04 +0000)]
am
a4fce24d: am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
a4fce24d6652e3869f70ca9f549ef45661608114':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 21:58:53 +0000 (21:58 +0000)]
am
e16f4393: am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
e16f439310b784bf46d033634e4a9e59a6a35c98':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 21:51:30 +0000 (21:51 +0000)]
am
506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.
* commit '
506cba8b51474e5dc5cdcf381d0a25dc118c2aca':
Doc Update: fixed unescaped angle brackets in code snippets.
kmccormick [Thu, 19 Feb 2015 20:17:18 +0000 (12:17 -0800)]
Doc Update: fixed unescaped angle brackets in code snippets.
Change-Id: Ie265dd58fb3a5fcffe955992dea7a1f9417a27d7
Rich Slogar [Thu, 19 Feb 2015 19:26:46 +0000 (19:26 +0000)]
am
cdd5ebec: am
7319ea27: am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
cdd5ebec38fbc246e446b27d50c27456416ab95c':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 19:20:32 +0000 (19:20 +0000)]
am
7319ea27: am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
7319ea278cf96c12b3945eee0c6387244887c32a':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 19:12:48 +0000 (19:12 +0000)]
am
cc883a1f: am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
cc883a1ff3d46ffc3cb59915d6d292f91bd984a2':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 19:06:32 +0000 (19:06 +0000)]
am
1e0face2: am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
1e0face2f77ddc7d9eb8fe6708386bfbfc167ec9':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:59:21 +0000 (18:59 +0000)]
am
b87aa6cb: Merge "docs: mipmap link updates" into lmp-docs
* commit '
b87aa6cb96341ab32d21f5340f1064fcaa607920':
docs: mipmap link updates
Rich Slogar [Thu, 19 Feb 2015 18:55:25 +0000 (18:55 +0000)]
Merge "docs: mipmap link updates" into lmp-docs
Rich Slogar [Thu, 19 Feb 2015 18:48:37 +0000 (10:48 -0800)]
docs: mipmap link updates
Change-Id: I345d4dc29e094a6835e04eec237d1b8b8a540eaa
Adrian Roos [Thu, 19 Feb 2015 16:39:40 +0000 (17:39 +0100)]
Fix change IME content description
Bug:
19434845
Change-Id: I28be1d8efb61d47abdce168b07a0846056eb650d
Rich Slogar [Thu, 19 Feb 2015 17:21:11 +0000 (17:21 +0000)]
am
3a0483e2: am
73cd35f2: am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
3a0483e2c12ca3bc97f050f03b674fca65d57b90':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 17:11:58 +0000 (17:11 +0000)]
am
73cd35f2: am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
73cd35f253e7c2efe8bef45d7eb7948011fdcae6':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 17:05:34 +0000 (17:05 +0000)]
am
f213a8c9: am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
f213a8c980109f9be940236f19a5b79b9be2b007':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 16:58:49 +0000 (16:58 +0000)]
am
14bb9188: am
f4f059d4: docs: studio 1.1 downloads
* commit '
14bb9188bfd001bbb96749e51b8d5edc242c89e7':
docs: studio 1.1 downloads
Rich Slogar [Thu, 19 Feb 2015 16:52:35 +0000 (16:52 +0000)]
am
f4f059d4: docs: studio 1.1 downloads
* commit '
f4f059d423add55516a8ea4bb1522f1329039e47':
docs: studio 1.1 downloads
Rich Slogar [Tue, 17 Feb 2015 20:14:16 +0000 (12:14 -0800)]
docs: studio 1.1 downloads
Change-Id: I663a91baba3b0a1e51aa8e3dbc991f067d0c255c
Jim Miller [Thu, 19 Feb 2015 03:24:38 +0000 (03:24 +0000)]
am
9c6c8df4: am
3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
9c6c8df44c5c05badee895e95d8f2460f95e0ec0':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 19 Feb 2015 03:17:58 +0000 (03:17 +0000)]
am
3dfd6389: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '
3dfd638921b3038c6df0e515478eb8bafccbf058':
Fix accessibility focus bug in statusbar
Jim Miller [Thu, 19 Feb 2015 03:13:37 +0000 (03:13 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Jim Miller [Thu, 19 Feb 2015 01:55:26 +0000 (17:55 -0800)]
Fix accessibility focus bug in statusbar
The notification_stack_scroller view of the new uber statusbar should
not be focusable for accessibility
Fixes bug
19296202
Change-Id: I1b3f43ee3c480c705044cb3d565c7c7f7019bcc3
Casey Burkhardt [Thu, 19 Feb 2015 00:59:39 +0000 (00:59 +0000)]
Merge "Refinements to magnification for improved wearable support." into lmp-mr1-modular-dev
Joe Fernandez [Thu, 19 Feb 2015 00:56:31 +0000 (00:56 +0000)]
am
cf657324: am
c9b5f98b: am
6f5d4bd8: am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
cf65732466e2dccf63575501fda18651d8ab19fc':
docs: remove reference to GCM doc from C2DM doc
Joe Fernandez [Thu, 19 Feb 2015 00:50:18 +0000 (00:50 +0000)]
am
c9b5f98b: am
6f5d4bd8: am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
c9b5f98bec64e52436c128e035558744c75ee2ef':
docs: remove reference to GCM doc from C2DM doc
Joe Fernandez [Thu, 19 Feb 2015 00:42:50 +0000 (00:42 +0000)]
am
6f5d4bd8: am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
6f5d4bd8c3f780744f0c739cbe168f764fbf824f':
docs: remove reference to GCM doc from C2DM doc
Natalie Silvanovich [Thu, 19 Feb 2015 00:36:59 +0000 (00:36 +0000)]
am
6f1eb5ba: am
0181b76b: am
bb4d0676: am
494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
* commit '
6f1eb5bab9ea6f31b3a7243b6b3fecf9afeaa9c3':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Joe Fernandez [Thu, 19 Feb 2015 00:36:50 +0000 (00:36 +0000)]
am
de91b384: am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
de91b3842b71c5acc6ad49cc2504fc0ff0e7e3e3':
docs: remove reference to GCM doc from C2DM doc
Joe Fernandez [Thu, 19 Feb 2015 00:30:32 +0000 (00:30 +0000)]
am
e385672c: docs: remove reference to GCM doc from C2DM doc
* commit '
e385672c9cb7ad212a92b77f72974035812ae9f1':
docs: remove reference to GCM doc from C2DM doc
Natalie Silvanovich [Thu, 19 Feb 2015 00:23:22 +0000 (00:23 +0000)]
am
0181b76b: am
bb4d0676: am
494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
* commit '
0181b76b7c822c9876d5c475a2393246d85db772':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Joe Fernandez [Thu, 19 Feb 2015 00:16:43 +0000 (16:16 -0800)]
docs: remove reference to GCM doc from C2DM doc
Change-Id: Ic044916487d56bab22e30b24392890b97acf9d44
Natalie Silvanovich [Thu, 19 Feb 2015 00:12:49 +0000 (00:12 +0000)]
am
bb4d0676: am
494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
* commit '
bb4d0676fde95e68fc708d54499bb40c8fa7ccd3':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Natalie Silvanovich [Thu, 19 Feb 2015 00:05:53 +0000 (00:05 +0000)]
am
494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
* commit '
494d5b7757fab576facc5a7e923d2a15650dea1c':
Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
Natalie Silvanovich [Thu, 19 Feb 2015 00:02:30 +0000 (00:02 +0000)]
Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-dev
Rich Slogar [Wed, 18 Feb 2015 23:36:44 +0000 (23:36 +0000)]
am
5af2270b: am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
5af2270b13d0edf33b0dd3e4bf84d0c6bed9de69':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:28:52 +0000 (23:28 +0000)]
am
cd9c0cab: am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
cd9c0cab77ea635910591116e54932f727317923':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:21:27 +0000 (23:21 +0000)]
am
708959b5: am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
708959b5326b7877553397fc17237e02f0d3adb1':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:14:44 +0000 (23:14 +0000)]
am
755c5d88: am
56375d90: docs: lint inspection updates
* commit '
755c5d8806ac55e5a9dc9bd272408eaeb1bf1acd':
docs: lint inspection updates
Rich Slogar [Wed, 18 Feb 2015 23:07:50 +0000 (23:07 +0000)]
am
56375d90: docs: lint inspection updates
* commit '
56375d90662041c3f3e98c6b77f5a3c3c506f43b':
docs: lint inspection updates
Rich Slogar [Wed, 7 Jan 2015 21:52:12 +0000 (13:52 -0800)]
docs: lint inspection updates
Change-Id: I870533a8b22b54b848b9245387ca40d79e49295f
Casey Burkhardt [Wed, 18 Feb 2015 20:18:15 +0000 (12:18 -0800)]
Refinements to magnification for improved wearable support.
This change refactors ScreenMagnifier to use resources for its triple-tap
adjustment and scale threshold values. New values more appropriate for
wearable form factors are supplied. This also fixes a bug in the triple-
tap detection logic where the incorrect ViewConfiguration value for the
tap threshold was used, prematurely disqualifying some touch events as
potential taps.
Change-Id: If47e556aadb5beb1bad24644122560c6fbe33bad
Geoff Mendal [Wed, 18 Feb 2015 14:07:41 +0000 (14:07 +0000)]
am
4a71ff87: (-s ours) Import translations. DO NOT MERGE
* commit '
4a71ff87b17acd54806a03f56bd1febdab7a4554':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 18 Feb 2015 14:00:48 +0000 (06:00 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iec9356f31dd078b9bcff76203229ea03451487aa
Auto-generated-cl: translation import
Geoff Mendal [Wed, 18 Feb 2015 13:47:24 +0000 (05:47 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic7373e3d8859d80c1472906c39ec46626b569c1b
Auto-generated-cl: translation import
Christopher Tate [Wed, 18 Feb 2015 02:17:57 +0000 (02:17 +0000)]
am
56238eaa: am
129ea76a: Fix wifi AP backup
* commit '
56238eaaa3688c9a9858058f4dc63aade7092d9b':
Fix wifi AP backup
Christopher Tate [Wed, 18 Feb 2015 02:07:55 +0000 (02:07 +0000)]
am
129ea76a: Fix wifi AP backup
* commit '
129ea76a4a129fb3e8e997e8c604c0712e8a9d73':
Fix wifi AP backup
Christopher Tate [Wed, 18 Feb 2015 01:04:01 +0000 (17:04 -0800)]
Fix wifi AP backup
An OutputStream buffers only by explicit contract. OutputStreamWriter
buffers internally, always. Do not get these behaviors confused.
Bug
19341967
Change-Id: I0610ed625b0175620083dd286f3a73c24956b171
Rich Slogar [Wed, 18 Feb 2015 00:25:35 +0000 (00:25 +0000)]
am
c9cc2c22: am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
* commit '
c9cc2c228b70f73b0b2243e0a3ee7f41265aa232':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:25:31 +0000 (00:25 +0000)]
am
958f6505: am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276
* commit '
958f65057b9cc82928f80d7d08ac5f1ed3ca6607':
docs: studio training basics create and run project updates
Andrew Solovay [Wed, 18 Feb 2015 00:25:23 +0000 (00:25 +0000)]
am
46e881de: am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
* commit '
46e881de6110cc09227dba1071a57c81b24250f7':
docs: Noted that purchaseToken is long and cannot be truncated.
Rich Sloager [Wed, 18 Feb 2015 00:25:20 +0000 (00:25 +0000)]
am
3a69c24f: am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc
* commit '
3a69c24fcaa01f276b5a77e05487f9614c3ae246':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 00:25:16 +0000 (00:25 +0000)]
am
6de1fd98: am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989
* commit '
6de1fd98f73b94c8bd5508b3e3d419d0b5d19621':
docs: site mipmap folder updates
Rich Slogar [Wed, 18 Feb 2015 00:25:12 +0000 (00:25 +0000)]
am
b7fee4f4: am
6cdde671: am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge:
c694604
* commit '
b7fee4f47c26c39f88e036b0dc368557f7b0cec0':
docs: studio mipmap update
Rich Slogar [Wed, 18 Feb 2015 00:22:40 +0000 (00:22 +0000)]
am
bd1fb402: am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs automerge:
0f60943
* commit '
bd1fb4021f790c7f61f2bb64feef1df8f14b1b7f':
docs: note to install linux packages
Rich Slogar [Wed, 18 Feb 2015 00:22:35 +0000 (00:22 +0000)]
am
f82c88e2: am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs automerge:
5f31276
* commit '
f82c88e28eddd5f38b53f66b345c030063bc17fe':
docs: studio training basics create and run project updates
Andrew Solovay [Wed, 18 Feb 2015 00:22:28 +0000 (00:22 +0000)]
am
4eb14e02: am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs automerge:
8d5ba01
* commit '
4eb14e0294a675d7350cfe3da01f1c9f37fb2943':
docs: Noted that purchaseToken is long and cannot be truncated.
Rich Slogar [Wed, 18 Feb 2015 00:18:54 +0000 (00:18 +0000)]
am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
automerge:
0f60943
* commit '
0f609432222e9eb946bfaa2bee45301324b97311':
docs: note to install linux packages
Rich Sloager [Wed, 18 Feb 2015 00:18:01 +0000 (00:18 +0000)]
am
dcf68e83: am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs automerge:
d225cfc
* commit '
dcf68e83d6868abb6334c7a1881724f04929e87c':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 00:17:56 +0000 (00:17 +0000)]
am
502f303c: am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs automerge:
797c989
* commit '
502f303c6108515a86d2826d1e87d474ffdb0945':
docs: site mipmap folder updates
Rich Slogar [Wed, 18 Feb 2015 00:17:52 +0000 (00:17 +0000)]
am
6cdde671: am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs automerge:
c694604
* commit '
6cdde6718c36851e136e7358ba2ac1fd32f6aae5':
docs: studio mipmap update
Rich Slogar [Wed, 18 Feb 2015 00:17:27 +0000 (00:17 +0000)]
am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
automerge:
5f31276
* commit '
5f3127620255167469fcba3d21334eb23217611d':
docs: studio training basics create and run project updates
Andrew Solovay [Wed, 18 Feb 2015 00:15:58 +0000 (00:15 +0000)]
am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
automerge:
8d5ba01
* commit '
8d5ba018266448caeb44637d273f63dbff2956af':
docs: Noted that purchaseToken is long and cannot be truncated.
Rich Sloager [Wed, 18 Feb 2015 00:14:42 +0000 (00:14 +0000)]
am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
automerge:
d225cfc
* commit '
d225cfc811fd2f4041195b6df1094e2a8a13d3be':
Revert "docs: studio proxy setup"
Rich Slogar [Wed, 18 Feb 2015 00:13:07 +0000 (00:13 +0000)]
am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
automerge:
797c989
* commit '
797c989e3be0d081098866206b0e5829a7fe2ce2':
docs: site mipmap folder updates
Rich Slogar [Wed, 18 Feb 2015 00:11:42 +0000 (00:11 +0000)]
am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
automerge:
c694604
* commit '
c694604ec58fc16f2526c8689b0def0fbcfb6fc7':
docs: studio mipmap update
Marco Nelissen [Wed, 18 Feb 2015 00:07:58 +0000 (00:07 +0000)]
am
2f71ee24: am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '
2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
Fix NPE
Rich Slogar [Wed, 18 Feb 2015 00:07:55 +0000 (00:07 +0000)]
am
e0f61e1c: am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '
e0f61e1c516be37125f16f1f0899ea6244d094c2':
docs: note to install linux packages
Marco Nelissen [Wed, 18 Feb 2015 00:01:02 +0000 (00:01 +0000)]
am
ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '
ffaee8bda9c8d22af17098fec0e6626301d91844':
Fix NPE
Rich Slogar [Wed, 18 Feb 2015 00:00:39 +0000 (00:00 +0000)]
am
717b4d13: Merge "docs: note to install linux packages" into lmp-docs
* commit '
717b4d130f67606c44122c2219ed35996afc360c':
docs: note to install linux packages
Rich Slogar [Tue, 17 Feb 2015 23:54:49 +0000 (23:54 +0000)]
Merge "docs: note to install linux packages" into lmp-docs
Marco Nelissen [Tue, 17 Feb 2015 23:54:29 +0000 (23:54 +0000)]
Merge "Fix NPE" into lmp-mr1-dev
Rich Slogar [Tue, 17 Feb 2015 23:53:49 +0000 (23:53 +0000)]
am
c48e9bde: am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
* commit '
c48e9bde6f5ae924dc1f9691da086c0a9077be3a':
docs: studio training basics create and run project updates
Rich Slogar [Tue, 17 Feb 2015 23:47:29 +0000 (23:47 +0000)]
am
9911aa51: Merge "docs: studio training basics create and run project updates" into lmp-docs
* commit '
9911aa51255d26c4299ab612430cd400e9468bcc':
docs: studio training basics create and run project updates
Craig Mautner [Tue, 17 Feb 2015 23:43:33 +0000 (23:43 +0000)]
am
ab8f60e4: am
a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '
ab8f60e425a90045eca06c09f0274f402b062d8f':
Do not make ActivityContainer available to apps. DO NOT MERGE
Rich Slogar [Tue, 17 Feb 2015 23:40:35 +0000 (23:40 +0000)]
Merge "docs: studio training basics create and run project updates" into lmp-docs
Craig Mautner [Tue, 17 Feb 2015 23:36:51 +0000 (23:36 +0000)]
am
a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '
a94e42970d4e664e193cde0cf2700cb7e15961c9':
Do not make ActivityContainer available to apps. DO NOT MERGE
Craig Mautner [Tue, 17 Feb 2015 23:30:33 +0000 (23:30 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
Alan Viverette [Tue, 17 Feb 2015 22:59:29 +0000 (22:59 +0000)]
am
0dfae079: am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '
0dfae079633764c3b6fceaea38fdc664e0e5a76d':
Revert "Fixed accessibility for the pin input view on keyguard."
Andrew Solovay [Tue, 17 Feb 2015 22:56:18 +0000 (22:56 +0000)]
am
d4c63b98: am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
* commit '
d4c63b98aa25370a1ed4b57199c71413d6e24750':
docs: Noted that purchaseToken is long and cannot be truncated.
Alan Viverette [Tue, 17 Feb 2015 22:52:06 +0000 (22:52 +0000)]
am
d5471a0b: Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
* commit '
d5471a0b2bf938cf83f4abac66a18664d8ca5277':
Revert "Fixed accessibility for the pin input view on keyguard."
Andrew Solovay [Tue, 17 Feb 2015 22:49:16 +0000 (22:49 +0000)]
am
fd454a57: Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
* commit '
fd454a579f5a474546db616aa014505cd50865b5':
docs: Noted that purchaseToken is long and cannot be truncated.
Alan Viverette [Tue, 17 Feb 2015 22:48:04 +0000 (22:48 +0000)]
Merge "Revert "Fixed accessibility for the pin input view on keyguard."" into lmp-mr1-dev
Alan Viverette [Tue, 17 Feb 2015 22:41:15 +0000 (22:41 +0000)]
am
504c77e1: am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '
504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
Fix year picker initial range
Rich Slogar [Tue, 17 Feb 2015 22:41:11 +0000 (22:41 +0000)]
am
2b29d96f: am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00
* commit '
2b29d96f0718f55429d0140ef9227310f42b228a':
docs: studio proxy setting setup
docs: studio proxy setup
Oliver Woodman [Tue, 17 Feb 2015 22:41:07 +0000 (22:41 +0000)]
am
1289d522: am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d
* commit '
1289d522986e44c681bae020cb6dffe1d563b1ed':
Update ExoPlayer developer guide.
Andrew Solovay [Tue, 17 Feb 2015 22:41:03 +0000 (22:41 +0000)]
Merge "docs: Noted that purchaseToken is long and cannot be truncated." into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:41:04 +0000 (22:41 +0000)]
am
696ea51a: am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
* commit '
696ea51a1c7c01061daf8693101e48d5d0701293':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:41:00 +0000 (22:41 +0000)]
am
4826bed5: am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
* commit '
4826bed5dbb07bc819db071b02de7c30925ff8a6':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:40:57 +0000 (22:40 +0000)]
am
40191d8e: am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
* commit '
40191d8e780724107c87edc5b1cfcea68a1442ca':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Alan Viverette [Tue, 17 Feb 2015 22:36:06 +0000 (22:36 +0000)]
am
d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '
d611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
Fix year picker initial range
Rich Slogar [Tue, 17 Feb 2015 22:36:02 +0000 (22:36 +0000)]
am
82510fa5: am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs automerge:
fa40f00
* commit '
82510fa5a63114e75c0ed154120e0ca92d401524':
docs: studio proxy setting setup
docs: studio proxy setup
Marco Nelissen [Tue, 17 Feb 2015 22:31:33 +0000 (14:31 -0800)]
Fix NPE
Path can be null if sd card was ejected, and we shouldn't make a thumbnail
in that case.
Bug:
19380821
Change-Id: Iee69effdd321622de026ad7b57c74cf9da81a176
Alan Viverette [Tue, 17 Feb 2015 22:33:03 +0000 (22:33 +0000)]
Merge "Fix year picker initial range" into lmp-mr1-dev
Oliver Woodman [Tue, 17 Feb 2015 22:31:41 +0000 (22:31 +0000)]
am
2a6bf82e: am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs automerge:
a40eb5d
* commit '
2a6bf82e26f5099b6659055c9b5ffce09efaedfd':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 22:31:37 +0000 (22:31 +0000)]
am
dbb32faf: am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs automerge:
bff1545
* commit '
dbb32faf33c95b245d75c0dc8d4578a011378f78':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:31:33 +0000 (22:31 +0000)]
am
2d43b730: am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs automerge:
cb73fb9
* commit '
2d43b7300dfad8bbf54d88e7b315d2ea38023131':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:31:28 +0000 (22:31 +0000)]
am
a6614a12: am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs automerge:
efb69b0
* commit '
a6614a12bbc6715af843d26f66fb32ae854323e6':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 22:31:24 +0000 (22:31 +0000)]
am
c2fa5e20: am
0a300b89: am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev automerge:
0684991
* commit '
c2fa5e205e617df6b622cb54fac77738e82e6320':
Add Asset management support for fonts.
Diego Perez [Tue, 17 Feb 2015 22:31:21 +0000 (22:31 +0000)]
am
d66f2eb2: am
a0fb87a3: am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev automerge:
a912fed
* commit '
d66f2eb241ba8676ef01f4efd23be5ae62d3a7aa':
Do not paint shadow if outside of the clip area
OSDN Git Service
