OSDN Git Service
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
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.
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
Rich Slogar [Tue, 17 Feb 2015 20:37:51 +0000 (20:37 +0000)]
Merge "docs: studio revision 1-1" into lmp-docs
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
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 [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: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
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
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)
Luan Nguyen [Thu, 12 Feb 2015 17:11:27 +0000 (17:11 +0000)]
Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs
Luan Nguyen [Thu, 12 Feb 2015 17:10:49 +0000 (17:10 +0000)]
Merge "docs: Fix notification api guide issues (
7461154,
12765600)" into lmp-docs
Luan Nguyen [Tue, 10 Feb 2015 21:10:39 +0000 (13:10 -0800)]
docs: Fix issue with onCreate() method declaration in file backup section
bug:
3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5
Luan Nguyen [Mon, 2 Feb 2015 20:17:40 +0000 (12:17 -0800)]
docs: Update device art generator to include Wear generic devices.
bug:
14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639
Luan Nguyen [Tue, 3 Feb 2015 17:58:34 +0000 (09:58 -0800)]
docs: Fix notification api guide issues (
7461154,
12765600)
bug:
7461154
bug:
12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2
Shanea King-Roberson [Tue, 10 Feb 2015 20:04:17 +0000 (20:04 +0000)]
am
c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
* commit '
c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
Adding videos for 5.0 changes and watch face development.
Shanea King-Roberson [Tue, 10 Feb 2015 19:57:29 +0000 (19:57 +0000)]
Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs
Luan Nguyen [Tue, 10 Feb 2015 18:40:34 +0000 (18:40 +0000)]
am
e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
* commit '
e49fbfa21ccdeba56001b48604524794acea119e':
docs: Fix various issues with incorrect code samples.
Luan Nguyen [Tue, 10 Feb 2015 18:31:29 +0000 (18:31 +0000)]
Merge "docs: Fix various issues with incorrect code samples." into lmp-docs
Eric Gilmore [Tue, 10 Feb 2015 18:29:36 +0000 (10:29 -0800)]
Adding videos for 5.0 changes and watch face development.
On branch pilot-videos
Changes to be committed:
modified: docs/html/about/versions/android-5.0-changes.jd
modified: docs/html/training/wearables/watch-faces/index.jd
Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
Eric Gilmore [Tue, 10 Feb 2015 17:45:47 +0000 (17:45 +0000)]
am
c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
* commit '
c9dbaf0483b0274879164806297180d260689f1f':
Doc change: refactor GCM docs to be platform-agnostic.
Luan Nguyen [Wed, 28 Jan 2015 17:30:28 +0000 (09:30 -0800)]
docs: Fix various issues with incorrect code samples.
bug:
15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
Eric Gilmore [Tue, 10 Feb 2015 01:13:01 +0000 (01:13 +0000)]
Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs
kmccormick [Fri, 12 Dec 2014 23:00:37 +0000 (15:00 -0800)]
Doc change: refactor GCM docs to be platform-agnostic.
Fix for:
b/
17733410
Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2
Joe Fernandez [Sat, 7 Feb 2015 01:00:53 +0000 (01:00 +0000)]
am
ba20f98c: Merge "docs: remove + annotations in version references" into lmp-docs
* commit '
ba20f98c88b754b3a69d55963275e20ab2fba6bf':
docs: remove + annotations in version references
Joe Fernandez [Sat, 7 Feb 2015 00:55:16 +0000 (00:55 +0000)]
Merge "docs: remove + annotations in version references" into lmp-docs
John Spurlock [Thu, 5 Feb 2015 20:18:03 +0000 (20:18 +0000)]
am
e0852368: Fix a few typos in Parcel.java.
* commit '
e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.
John Spurlock [Wed, 4 Feb 2015 20:47:40 +0000 (15:47 -0500)]
Fix a few typos in Parcel.java.
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
Deepanshu Gupta [Wed, 4 Feb 2015 19:16:52 +0000 (11:16 -0800)]
Changes made by intelliJ 14.1
Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4
Diego Perez [Wed, 4 Feb 2015 11:53:15 +0000 (11:53 +0000)]
Do not paint shadow if outside of the clip area
Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
Deepanshu Gupta [Wed, 28 Jan 2015 02:35:46 +0000 (18:35 -0800)]
Add Asset management support for fonts.
Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
Joe Fernandez [Mon, 2 Feb 2015 17:20:35 +0000 (17:20 +0000)]
am
eba583e3: docs: February 2015 Dashboard updates
* commit '
eba583e3930891f7a8a0e48a961a4a2471fc757c':
docs: February 2015 Dashboard updates
Joe Fernandez [Mon, 2 Feb 2015 16:48:42 +0000 (08:48 -0800)]
docs: February 2015 Dashboard updates
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
Jon Larimer [Sat, 31 Jan 2015 03:39:19 +0000 (03:39 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation automerge:
5c9d0de
automerge:
9e7e8af
* commit '
9e7e8afbb934742cb7996b22e32f94c1c09704af':
Joe Fernandez [Sat, 31 Jan 2015 01:59:54 +0000 (01:59 +0000)]
am
1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs
* commit '
1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
docs: training intent doc error update
Joe Fernandez [Sat, 31 Jan 2015 01:00:15 +0000 (01:00 +0000)]
Merge "docs: training intent doc error update" into lmp-docs
Rich Slogar [Wed, 28 Jan 2015 23:22:24 +0000 (15:22 -0800)]
docs: training intent doc error update
b/
18386294
Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
Deepanshu Gupta [Sat, 31 Jan 2015 00:50:34 +0000 (00:50 +0000)]
Merge "Limited AppCompat support" into lmp-dev
Deepanshu Gupta [Sat, 31 Jan 2015 00:48:56 +0000 (00:48 +0000)]
Merge "Resource resolution fixes." into lmp-dev
Jon Larimer [Sat, 31 Jan 2015 00:05:54 +0000 (00:05 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
automerge:
5c9d0de
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Joe Fernandez [Fri, 30 Jan 2015 23:34:44 +0000 (23:34 +0000)]
am
2b68ab3a: Merge "docs: studio emulator platform update" into lmp-docs
* commit '
2b68ab3adda1ecce045b7b56b8c37ab4d960d2b4':
docs: studio emulator platform update
Joe Fernandez [Fri, 30 Jan 2015 23:24:43 +0000 (23:24 +0000)]
Merge "docs: studio emulator platform update" into lmp-docs
Jon Larimer [Fri, 30 Jan 2015 22:11:56 +0000 (22:11 +0000)]
am
5c9d0de1: am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
5c9d0de174caf151937f19aa6898f60bce3fb4f4':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
159aa73574804967aded45d06b70df5a8dd64a58':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Rich Slogar [Fri, 30 Jan 2015 01:41:58 +0000 (01:41 +0000)]
am
e0063faa: Merge "docs: linux requirements update" into lmp-docs
* commit '
e0063faa8707e2424a33625aaf2228540fa67e85':
docs: linux requirements update
Scott Rowe [Fri, 30 Jan 2015 01:37:23 +0000 (01:37 +0000)]
am
b86c3b80: Merge "docs: Card View for Android TV training" into lmp-docs
* commit '
b86c3b80db09da85b50c1809520bbf893cb83d93':
docs: Card View for Android TV training
Scott Rowe [Fri, 30 Jan 2015 01:37:21 +0000 (01:37 +0000)]
am
87a1bf09: docs: b/
19193358 Android TV overscan instructions: settings reversed in text
* commit '
87a1bf097078e43dc9e7c060daf8d835afd7bf6d':
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Rich Slogar [Fri, 30 Jan 2015 01:32:17 +0000 (01:32 +0000)]
Merge "docs: linux requirements update" into lmp-docs
Scott Rowe [Fri, 30 Jan 2015 01:30:43 +0000 (01:30 +0000)]
Merge "docs: Card View for Android TV training" into lmp-docs
Jon Larimer [Thu, 29 Jan 2015 20:54:43 +0000 (15:54 -0500)]
Fix build breakage in older branches by avoiding <> notation
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
Jon Larimer [Thu, 29 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev automerge:
ea63fd7
automerge:
bebfd58
* commit '
bebfd58604ae8a70c08056f3a5cd9289b27fe11c':
Jon Larimer [Thu, 29 Jan 2015 19:29:31 +0000 (19:29 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev automerge:
48dad94 -s ours
automerge:
6fe42f0 -s ours
* commit '
6fe42f08702a0773c0dd2aad2d41c54f73bb057b':
Scott Rowe [Thu, 29 Jan 2015 19:01:33 +0000 (11:01 -0800)]
docs: b/
19193358 Android TV overscan instructions: settings reversed in text
Change-Id: I7c617ed67068927d27c5a2243a2dd07b04e668b5
Jon Larimer [Thu, 29 Jan 2015 18:55:25 +0000 (18:55 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
automerge:
ea63fd7
* commit '
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:54:16 +0000 (18:54 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
automerge:
48dad94 -s ours
* commit '
48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
Scott Rowe [Wed, 3 Dec 2014 21:21:53 +0000 (13:21 -0800)]
docs: Card View for Android TV training
Change-Id: I4797c0b3c4ae7106349095016d778992802ccb96
Jon Larimer [Thu, 29 Jan 2015 18:43:47 +0000 (18:43 +0000)]
am
ea63fd7f: am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:43:43 +0000 (18:43 +0000)]
am
48dad949: (-s ours) am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
48dad94919c9f5027559feed3b05d8d01a03f687':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:36:59 +0000 (18:36 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:36:55 +0000 (18:36 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
a43742ec620cb11faffa2c2b1847dc1accce5736':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:32:09 +0000 (18:32 +0000)]
am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)]
am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
6813f29e3247f0567b77fe7eb451215b5fadf67b':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:25:48 +0000 (18:25 +0000)]
am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev automerge:
7ab0ac6 -s ours
automerge:
f8571c8a -s ours
* commit '
f8571c8a170f0cb8341b3e2adda306bb709b824a':
Jon Larimer [Thu, 29 Jan 2015 18:25:28 +0000 (18:25 +0000)]
am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:25:24 +0000 (18:25 +0000)]
am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
76cdbb0475fe881c8e7320c277e5ea4848be5bff':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:12:01 +0000 (18:12 +0000)]
am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
de9a76ed997c300a6c5f2f82c517719503af9045':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:11:57 +0000 (18:11 +0000)]
am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
d0318a63e51107d5589d8970b079c27d8f788c5a':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:10:34 +0000 (18:10 +0000)]
am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
automerge:
7ab0ac6 -s ours
* commit '
7ab0ac6927538ad3e7d09adc3524b88bfad75abc':
DO NOT MERGE Restore calling identity before checking permission
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 18:00:58 +0000 (18:00 +0000)]
am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:00:55 +0000 (18:00 +0000)]
am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
7dd12d7633663c7f5802bdaaf8e7232a48aba811':
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:57 +0000 (17:48 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
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
Jon Larimer [Thu, 29 Jan 2015 17:48:14 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-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
Deepanshu Gupta [Thu, 15 Jan 2015 23:35:21 +0000 (15:35 -0800)]
Limited AppCompat support
Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
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.
Adam Lesinski [Fri, 7 Nov 2014 19:26:14 +0000 (11:26 -0800)]
Fix ParceledListSlice to enforce the same concrete types among its elements.
Bug:
17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit
3df1c38ee098872352086e03d6f1adb16796ee29)
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
OSDN Git Service
