OSDN Git Service
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
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
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: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
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: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 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
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
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
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:30:33 +0000 (23:30 +0000)]
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
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.
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
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
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
Rich Slogar [Tue, 17 Feb 2015 22:28:45 +0000 (22:28 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
automerge:
fa40f00
* commit '
fa40f0072f4eb24d0e2b641bf7b4235e99362c1e':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Sloager [Tue, 17 Feb 2015 22:27:44 +0000 (22:27 +0000)]
am
d75a6833: am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit '
d75a68339af547b89068e1e4fe78d34c9b11f38e':
Revert "docs: studio proxy setup"
Oliver Woodman [Tue, 17 Feb 2015 22:27:16 +0000 (22:27 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
automerge:
a40eb5d
* commit '
a40eb5db455ebb225a7ff0afa244256079d8cf20':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 22:25:53 +0000 (22:25 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
automerge:
bff1545
* commit '
bff1545a3e6a3c296a8ffcefb5f1141f9a21c5d1':
docs: studio revision 1-1
Rich Slogar [Tue, 17 Feb 2015 22:24:38 +0000 (22:24 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
automerge:
cb73fb9
* commit '
cb73fb90443a3a3fee645aa3f01d38b19f108377':
docs: android plugin for gradle revisions page
David Friedman [Tue, 17 Feb 2015 22:22:50 +0000 (22:22 +0000)]
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 '
efb69b003e24757fbf04f219a61a4a71adada3a2':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Deepanshu Gupta [Tue, 17 Feb 2015 22:21:11 +0000 (22:21 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
automerge:
0684991
* commit '
068499111c173fdd9869e7dbe5b9de857aca1c2d':
Add Asset management support for fonts.
Rich Slogar [Tue, 17 Feb 2015 22:20:51 +0000 (22:20 +0000)]
am
d72bea9d: am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit '
d72bea9dea10a956bf9b92de71e2dc046e7eae90':
docs: site mipmap folder updates
Rich Slogar [Tue, 17 Feb 2015 22:20:46 +0000 (22:20 +0000)]
am
43fb9e42: am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
* commit '
43fb9e42df4754a7d2646898d384a369d329197c':
docs: studio mipmap update
Rich Sloager [Tue, 17 Feb 2015 22:20:43 +0000 (22:20 +0000)]
am
099ce513: Merge "Revert "docs: studio proxy setup"" into lmp-docs
* commit '
099ce51393721424a7cc1fbd29fe59a1970a55ed':
Revert "docs: studio proxy setup"
Diego Perez [Tue, 17 Feb 2015 22:19:43 +0000 (22:19 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
automerge:
a912fed
* commit '
a912fedbc5fba99fb75884a1941d58170822ceb4':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Tue, 17 Feb 2015 22:18:35 +0000 (22:18 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
automerge:
4e47416
* commit '
4e47416012b8cb88d564a04a29c0b79a28b9e529':
Changes made by intelliJ 14.1
Rich Slogar [Tue, 17 Feb 2015 22:13:51 +0000 (22:13 +0000)]
am
40132ee1: Merge "docs: site mipmap folder updates" into lmp-docs
* commit '
40132ee15afbc45858b637410aecb861da60878a':
docs: site mipmap folder updates
Rich Slogar [Tue, 17 Feb 2015 22:13:48 +0000 (22:13 +0000)]
am
3c3b780c: Merge "docs: studio mipmap update" into lmp-docs
* commit '
3c3b780caea0bec62904a83f385f5a865fb259a7':
docs: studio mipmap update
Rich Sloager [Tue, 17 Feb 2015 22:13:44 +0000 (22:13 +0000)]
Merge "Revert "docs: studio proxy setup"" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:13:37 +0000 (22:13 +0000)]
am
9c9a3afb: am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
9c9a3afb95dcac7bf356edf25c8d86187ea59afd':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Sloager [Tue, 17 Feb 2015 22:10:27 +0000 (22:10 +0000)]
Revert "docs: studio proxy setup"
This reverts commit
c3e0107ce30aa676011bf7ea0daa9c8db750f024.
Change-Id: I7edf925fe51a79284a3e7a94d60174308fa56d4b
Rich Slogar [Tue, 17 Feb 2015 22:08:41 +0000 (22:08 +0000)]
Merge "docs: site mipmap folder updates" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:45 +0000 (22:06 +0000)]
Merge "docs: studio mipmap update" into lmp-docs
Rich Slogar [Tue, 17 Feb 2015 22:06:21 +0000 (22:06 +0000)]
am
8823b93d: Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* commit '
8823b93d5c32bb7a8c757022ce055ca53b71171f':
docs: studio proxy setting setup
docs: studio proxy setup
Rich Slogar [Tue, 17 Feb 2015 22:02:44 +0000 (22:02 +0000)]
Merge changes If3a78fc7,Ifbe3f03a into lmp-docs
* changes:
docs: studio proxy setting setup
docs: studio proxy setup
Alan Viverette [Tue, 17 Feb 2015 21:09:04 +0000 (13:09 -0800)]
Fix year picker initial range
BUG:
19410328
Change-Id: I2a2952eb58eb856f93b7af2f49e08abe71078aa9
Oliver Woodman [Tue, 17 Feb 2015 20:59:50 +0000 (20:59 +0000)]
am
533149d5: am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
533149d54f881e07f36c2fd62c861942542340fc':
Update ExoPlayer developer guide.
Oliver Woodman [Tue, 17 Feb 2015 20:53:13 +0000 (20:53 +0000)]
am
fe3e71be: Merge "Update ExoPlayer developer guide." into lmp-docs
* commit '
fe3e71befacc5d0777eb0c7099dd910197cfb6b6':
Update ExoPlayer developer guide.
Rich Slogar [Tue, 17 Feb 2015 20:49:44 +0000 (20:49 +0000)]
am
8c124744: am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
8c124744b625f547a5ba15cbb442c605f109bae0':
docs: studio revision 1-1
Oliver Woodman [Tue, 17 Feb 2015 20:48:49 +0000 (20:48 +0000)]
Merge "Update ExoPlayer developer guide." into lmp-docs
Oliver Woodman [Mon, 16 Feb 2015 17:49:34 +0000 (17:49 +0000)]
Update ExoPlayer developer guide.
This is a minimal update, just to fix things that are broken
or no longer make sense as of the v1.2.0 release.
Change-Id: If519709c91c975d96b62e2dd28e18e2105735c2b
Rich Slogar [Tue, 17 Feb 2015 20:42:44 +0000 (20:42 +0000)]
am
76dd6aa7: Merge "docs: studio revision 1-1" into lmp-docs
* commit '
76dd6aa7f9d36183f44654eb45dc304abe8b7caf':
docs: studio revision 1-1
Craig Mautner [Tue, 17 Feb 2015 18:17:21 +0000 (10:17 -0800)]
Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug
19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs
Rich Slogar [Mon, 9 Feb 2015 19:40:44 +0000 (11:40 -0800)]
docs: site mipmap folder updates
b/
12874352
Change-Id: I0b32502c8075740c66f04203110c9bfe8be103f9
Rich Slogar [Tue, 17 Feb 2015 20:26:46 +0000 (20:26 +0000)]
am
d2856643: am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
d285664399f8f68750e75707a35046e3c9592a2d':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:19:59 +0000 (20:19 +0000)]
am
4abf87f1: Merge "docs: android plugin for gradle revisions page" into lmp-docs
* commit '
4abf87f134fa81460e018bb7130e88639281e1ce':
docs: android plugin for gradle revisions page
Rich Slogar [Tue, 17 Feb 2015 20:16:08 +0000 (20:16 +0000)]
Merge "docs: android plugin for gradle revisions page" into lmp-docs
Adrian Roos [Tue, 17 Feb 2015 19:46:01 +0000 (20:46 +0100)]
Revert "Fixed accessibility for the pin input view on keyguard."
Also removes the Klondike from the content description.
This reverts commit
c199ef37594b946cb295c29df321e74332ee5408
from change I3dd05fa1714da36795f448718fd70f1cdbfe2584
Bug:
18528774
Change-Id: I8a85076f939a8b78075b5a6322009ebfd78bf8d3
Adrian Roos [Tue, 17 Feb 2015 15:37:53 +0000 (16:37 +0100)]
Disable color view animations when stable insets change
Prevents color view from showing up on phones when
the orientation changes to landscape. Previously, the
animation was only prevented when the stable inset of a
bar became nonzero; now we disable animations whenever
the nonzeroness changes.
Bug:
19353466
Change-Id: I31b4103fe984d158a98cd446ac2ddbe15a408e49
David Friedman [Sat, 14 Feb 2015 02:50:49 +0000 (02:50 +0000)]
am
53ec037f: am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
53ec037f9eb0e29f958faa334cf23c35f079eb85':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:42:44 +0000 (02:42 +0000)]
am
03efba0e: Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
* commit '
03efba0e3a64cf4b0084bed056c24fbe8a2030c9':
This file is misplaced, and serves no purpose. I am sending it to oblivion.
David Friedman [Sat, 14 Feb 2015 02:36:33 +0000 (02:36 +0000)]
Merge "This file is misplaced, and serves no purpose. I am sending it to oblivion." into lmp-docs
Rich Slogar [Fri, 30 Jan 2015 23:25:21 +0000 (15:25 -0800)]
docs: studio mipmap update
Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d
Rich Slogar [Mon, 26 Jan 2015 19:08:55 +0000 (11:08 -0800)]
docs: studio proxy setting setup
b/
18332702
Change-Id: If3a78fc7b906bb94cfa74fc07b95ef72a84cf825
Rich Slogar [Tue, 10 Feb 2015 20:56:46 +0000 (12:56 -0800)]
docs: studio revision 1-1
Change-Id: I7464ace70e9b9e430fd0f03329e20b64b1e1a56a
Rich Slogar [Thu, 15 Jan 2015 00:04:08 +0000 (16:04 -0800)]
docs: android plugin for gradle revisions page
Change-Id: I15750eb11f69f9286fdd542c8e5a5e702b1a1255
Deepanshu Gupta [Fri, 13 Feb 2015 22:38:23 +0000 (22:38 +0000)]
am
ad879adb: Merge "Add Asset management support for fonts." into lmp-dev
* commit '
ad879adb65ffa577844738522ab6d7d30aba2ead':
Add Asset management support for fonts.
Diego Perez [Fri, 13 Feb 2015 22:38:17 +0000 (22:38 +0000)]
am
98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev
* commit '
98c3461acd6699ab0448f1785909d0d39cd61b5a':
Do not paint shadow if outside of the clip area
Deepanshu Gupta [Fri, 13 Feb 2015 22:38:07 +0000 (22:38 +0000)]
am
12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev
* commit '
12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
Changes made by intelliJ 14.1
Deepanshu Gupta [Fri, 13 Feb 2015 22:34:17 +0000 (22:34 +0000)]
Merge "Add Asset management support for fonts." into lmp-dev
Diego Perez [Fri, 13 Feb 2015 22:34:14 +0000 (22:34 +0000)]
Merge "Do not paint shadow if outside of the clip area" into lmp-dev
Deepanshu Gupta [Fri, 13 Feb 2015 22:33:47 +0000 (22:33 +0000)]
Merge "Changes made by intelliJ 14.1" into lmp-dev
David Friedman [Fri, 13 Feb 2015 05:30:59 +0000 (21:30 -0800)]
This file is misplaced, and serves no purpose. I am sending it to oblivion.
Change-Id: I91ed7bc228849f3181591357037b368b4b261eee
Svetoslav [Fri, 13 Feb 2015 01:54:15 +0000 (17:54 -0800)]
Accessibility: Ensure fresh accessilbity focused and input focused nodes.
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
Ruben Brunk [Fri, 13 Feb 2015 01:22:24 +0000 (01:22 +0000)]
Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev
Andrew Solovay [Sat, 7 Feb 2015 01:29:24 +0000 (17:29 -0800)]
docs: Noted that purchaseToken is long and cannot be truncated.
Noted in reference and integration doc that the token for Google Play
purchases may be up to 1,000 chars long, and the entire token must
be returned (not abbreviated or truncated) to any method that needs
it.
See first comment for doc stage location.
bug:
19099521
Change-Id: I0a0f187293ea522c218f6c3287b4c36ee6725a90
Luan Nguyen [Fri, 13 Feb 2015 00:16:48 +0000 (00:16 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
automerge:
fe2c687
* commit '
fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Fri, 13 Feb 2015 00:15:09 +0000 (00:15 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
automerge:
e0306bb
* commit '
e0306bbece4fd32d1e2f837dc515506180e04e8e':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Fri, 13 Feb 2015 00:13:35 +0000 (00:13 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
automerge:
946bf2d
* commit '
946bf2de30545a548022b8b8ba1b0ebc890ab08e':
docs: Fix notification api guide issues (
7461154,
12765600)
John Spurlock [Thu, 12 Feb 2015 22:52:12 +0000 (22:52 +0000)]
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Jim Miller [Thu, 12 Feb 2015 21:48:10 +0000 (21:48 +0000)]
Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
Ruben Brunk [Thu, 12 Feb 2015 20:16:44 +0000 (12:16 -0800)]
camera2: Fix legacy scaling factor application.
Bug:
19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
Luan Nguyen [Thu, 12 Feb 2015 19:13:47 +0000 (19:13 +0000)]
am
2ea209ab: am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:07:47 +0000 (19:07 +0000)]
am
8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
* commit '
8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
docs: Update device art generator to include Wear generic devices.
Luan Nguyen [Thu, 12 Feb 2015 19:01:02 +0000 (19:01 +0000)]
Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs
Jeremy Joslin [Thu, 12 Feb 2015 18:34:01 +0000 (18:34 +0000)]
Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev
John Spurlock [Thu, 12 Feb 2015 18:29:37 +0000 (13:29 -0500)]
NoMan: Initialize filter value reported to listeners.
In addition to relying on change callbacks.
Bug:
19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
Luan Nguyen [Thu, 12 Feb 2015 17:35:43 +0000 (17:35 +0000)]
am
e726495a: am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
e726495a269b48f9b94fa9e545f84e79d587a282':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:35:38 +0000 (17:35 +0000)]
am
b6de0316: am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
b6de0316a8f77b4425057eb4e75f7375c47fad65':
docs: Fix notification api guide issues (
7461154,
12765600)
Luan Nguyen [Thu, 12 Feb 2015 17:17:04 +0000 (17:17 +0000)]
am
fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
* commit '
fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
docs: Fix issue with onCreate() method declaration in file backup section
Luan Nguyen [Thu, 12 Feb 2015 17:16:59 +0000 (17:16 +0000)]
am
e1f90b4e: Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
* commit '
e1f90b4e1e438c0086409ae0253a6452f2befbac':
docs: Fix notification api guide issues (
7461154,
12765600)
OSDN Git Service
