OSDN Git Service
Jean-Michel Trivi [Wed, 26 Mar 2014 21:00:46 +0000 (21:00 +0000)]
Merge "Continue refactoring MediaFocusControl"
Jean-Michel Trivi [Wed, 26 Mar 2014 21:00:25 +0000 (21:00 +0000)]
Merge "Continue refactoring of MediaFocusControl"
Mark Salyzyn [Wed, 26 Mar 2014 20:08:00 +0000 (20:08 +0000)]
am
959bce3e: am
4e3abafc: am
5daf51c0: Merge "jni: 64-bit compile issue"
* commit '
959bce3e69b4eb5dcba9ec48d92f21002f9c13b3':
jni: 64-bit compile issue
Ricardo Cervera [Wed, 26 Mar 2014 20:04:05 +0000 (20:04 +0000)]
am
39d1b3f0: am
a8d12f76: am
19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
* commit '
39d1b3f0b887f37555924cc3737347b2c4044ce9':
docs: Added release notes for Support Library 19.1.0
Mark Salyzyn [Wed, 26 Mar 2014 20:00:13 +0000 (20:00 +0000)]
am
4e3abafc: am
5daf51c0: Merge "jni: 64-bit compile issue"
* commit '
4e3abafc9400eed38a1e76897b79e923acfaf8ed':
jni: 64-bit compile issue
Glenn Kasten [Wed, 26 Mar 2014 20:00:10 +0000 (20:00 +0000)]
Merge "Revert "Expand install observer semantics""
Glenn Kasten [Wed, 26 Mar 2014 19:59:48 +0000 (19:59 +0000)]
Revert "Expand install observer semantics"
This reverts commit
ab8a501f255b272af887acb0e66eb71cdf24c755.
Change-Id: I4ab4ae1a96efa2adf9d5a513793d8b84eef38b4e
Mark Salyzyn [Wed, 26 Mar 2014 19:56:02 +0000 (12:56 -0700)]
am
5daf51c0: Merge "jni: 64-bit compile issue"
* commit '
5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
jni: 64-bit compile issue
Ricardo Cervera [Wed, 26 Mar 2014 19:53:28 +0000 (19:53 +0000)]
am
a8d12f76: am
19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
* commit '
a8d12f764ccf85da52b82d6726c4a2a12c475fcf':
docs: Added release notes for Support Library 19.1.0
Mark Salyzyn [Wed, 26 Mar 2014 19:52:11 +0000 (19:52 +0000)]
Merge "jni: 64-bit compile issue"
Alan Viverette [Wed, 26 Mar 2014 19:50:49 +0000 (19:50 +0000)]
Merge "Fix attribute extraction, use color attrs in Quantum drawables"
Ricardo Cervera [Wed, 26 Mar 2014 19:47:38 +0000 (19:47 +0000)]
am
19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
* commit '
19a67a71d0105bb27472e26e5f5e0c8ef3a71dfd':
docs: Added release notes for Support Library 19.1.0
Ricardo Cervera [Wed, 26 Mar 2014 19:41:04 +0000 (19:41 +0000)]
Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev
Alan Viverette [Wed, 26 Mar 2014 00:58:50 +0000 (17:58 -0700)]
Fix attribute extraction, use color attrs in Quantum drawables
Removes some unused entries in the Quantum themes and styles and
collapses identical styles since we don't have separate drawables
anymore. Adds some Quantum text appearances as styles.
BUG:
12368046
Change-Id: I9334feb87391cd54ad3b77b297d135de436e1417
Christopher Tate [Wed, 26 Mar 2014 19:23:53 +0000 (19:23 +0000)]
Merge "Expand install observer semantics"
Ricardo Cervera [Wed, 26 Mar 2014 18:29:32 +0000 (18:29 +0000)]
am
5d005ba9: am
3d093ea6: am
e59a2665: am
1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
* commit '
5d005ba9a7e5d0bab8b1a8ce9b332e30fa3b5054':
docs: Added Android Studio build system doc.
Mark Salyzyn [Thu, 20 Mar 2014 19:09:01 +0000 (12:09 -0700)]
jni: 64-bit compile issue
- switch to PRId64
- some unused parameter warning suppression
Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
Ricardo Cervera [Wed, 26 Mar 2014 18:23:10 +0000 (18:23 +0000)]
am
3d093ea6: am
e59a2665: am
1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
* commit '
3d093ea69a488e4afd982a59273f0bf8c3474b5a':
docs: Added Android Studio build system doc.
Ricardo Cervera [Wed, 26 Mar 2014 18:16:35 +0000 (18:16 +0000)]
am
e59a2665: am
1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
* commit '
e59a26650afbc664aeda08f7e69c2d135631c34d':
docs: Added Android Studio build system doc.
Ricardo Cervera [Wed, 26 Mar 2014 18:11:33 +0000 (18:11 +0000)]
am
1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs
* commit '
1b59f291573deb4c1d6f60035637a3c49e671ab4':
docs: Added Android Studio build system doc.
Ricardo Cervera [Wed, 26 Mar 2014 18:06:51 +0000 (18:06 +0000)]
Merge "docs: Added Android Studio build system doc." into klp-docs
John Spurlock [Wed, 26 Mar 2014 17:44:16 +0000 (17:44 +0000)]
Merge "Zen mode updates."
John Spurlock [Tue, 25 Mar 2014 21:45:56 +0000 (17:45 -0400)]
Zen mode updates.
- Now only two modes, no more ZEN_MODE_FULL.
- Alarms are allowed by default.
- Interstitial dialog cleanup to follow current UX.
Change-Id: I8e4c8f64854dabfef69ad33b3eb35bee07e55ef7
Chris Craik [Wed, 26 Mar 2014 17:40:31 +0000 (17:40 +0000)]
Merge "Add private circular reveal API on View/RenderNode"
Jean-Michel Trivi [Wed, 26 Mar 2014 17:36:59 +0000 (17:36 +0000)]
Merge "Continue refactoring of MediaFocusControl"
Chris Wren [Wed, 26 Mar 2014 17:09:55 +0000 (17:09 +0000)]
Merge "always clear the HeadsUpDecayTimer"
Chris Wren [Wed, 26 Mar 2014 16:39:41 +0000 (12:39 -0400)]
always clear the HeadsUpDecayTimer
for non-clearable heads up notifications,
a decay timer may be left in the queue
Bug:
13652819
Change-Id: I533db43484731922790f8501250b5a1ca7d4ba0b
Nick Kralevich [Wed, 26 Mar 2014 16:36:33 +0000 (16:36 +0000)]
am
32cc40a9: am
fdd63510: am
491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '
32cc40a9b57750451a6489e01526dc6a14d72bff':
Note libselinux dependency on packages.list format changes.
Nick Kralevich [Wed, 26 Mar 2014 15:55:41 +0000 (15:55 +0000)]
am
fdd63510: am
491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '
fdd6351067740f80148ff03c43d2ebc91f1d9656':
Note libselinux dependency on packages.list format changes.
Nick Kralevich [Wed, 26 Mar 2014 15:47:39 +0000 (08:47 -0700)]
am
491eaf22: Merge "Note libselinux dependency on packages.list format changes."
* commit '
491eaf2255a95186e84092eae4ec43582eebb37b':
Note libselinux dependency on packages.list format changes.
Nick Kralevich [Wed, 26 Mar 2014 15:41:14 +0000 (15:41 +0000)]
Merge "Note libselinux dependency on packages.list format changes."
Stephen Smalley [Wed, 26 Mar 2014 13:19:12 +0000 (09:19 -0400)]
Note libselinux dependency on packages.list format changes.
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Christopher Tate [Mon, 24 Mar 2014 23:25:51 +0000 (16:25 -0700)]
Expand install observer semantics
...and now fail conservatively when two apps both attempt to define
the same permission.
We also finally have a (hidden) interface class for observing package
installation so that we can now rev the interface without breaking
existing callers.
Bug
13551375
Change-Id: I3a286d024a30e812ee4b098f345401df3c00e178
Dan Sandler [Fri, 21 Mar 2014 16:04:19 +0000 (12:04 -0400)]
Categorize some system notifications.
Change-Id: Ia343bc276f50f488e2165056cff249a02f01d45a
Adam Lesinski [Wed, 26 Mar 2014 00:41:27 +0000 (00:41 +0000)]
Merge "Use new build var to depend on an APKs resources"
Craig Mautner [Wed, 26 Mar 2014 00:32:14 +0000 (00:32 +0000)]
am
16744ac3: am
d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit '
16744ac3f7b030f1192d298132256ac06eaff205':
Defer removal of activity until animation complete.
Svetoslav [Wed, 26 Mar 2014 00:28:26 +0000 (00:28 +0000)]
Merge "Wrong constant used for undefined accessibility window id."
Svetoslav [Wed, 26 Mar 2014 00:26:04 +0000 (17:26 -0700)]
Wrong constant used for undefined accessibility window id.
Change-Id: I8b14db034a42a7ffd211a46fa3fee7bf2a6eac8f
Craig Mautner [Wed, 26 Mar 2014 00:26:03 +0000 (00:26 +0000)]
am
d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev
* commit '
d1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
Defer removal of activity until animation complete.
Jean-Michel Trivi [Wed, 26 Mar 2014 00:25:25 +0000 (17:25 -0700)]
Continue refactoring MediaFocusControl
Rename MediaController to PlayerRecord.
Change-Id: Icf474b4107649f501341309bf7ec520aa1e71586
Craig Mautner [Wed, 26 Mar 2014 00:21:56 +0000 (00:21 +0000)]
Merge "Defer removal of activity until animation complete." into klp-modular-dev
Scott Main [Wed, 26 Mar 2014 00:12:20 +0000 (00:12 +0000)]
am
57be1303: am
c3bcce59: am
01e68cab: am
ad52a4ce: Merge "fix broken link" into klp-docs
* commit '
57be13035205a32707df94ceaf055ffa334d2852':
fix broken link
Scott Main [Wed, 26 Mar 2014 00:05:17 +0000 (00:05 +0000)]
am
c3bcce59: am
01e68cab: am
ad52a4ce: Merge "fix broken link" into klp-docs
* commit '
c3bcce5907553c6f006fc2c0ac74383f01647827':
fix broken link
Adam Lesinski [Tue, 25 Mar 2014 22:54:02 +0000 (15:54 -0700)]
Use new build var to depend on an APKs resources
Some other projects use LOCAL_APK_LIBRARIES and don't yet
work with the new shared library changes.
Change-Id: Ibb54bc1b5e3eb1252cf5b4e45249b089d25854ac
Scott Main [Tue, 25 Mar 2014 23:58:10 +0000 (23:58 +0000)]
am
01e68cab: am
ad52a4ce: Merge "fix broken link" into klp-docs
* commit '
01e68cabb523440382ef3a02a512f8ce3b8af287':
fix broken link
Scott Main [Tue, 25 Mar 2014 23:53:24 +0000 (23:53 +0000)]
am
ad52a4ce: Merge "fix broken link" into klp-docs
* commit '
ad52a4ce9964508288316bfc5fb52833bf70b6a5':
fix broken link
Craig Mautner [Tue, 18 Mar 2014 21:26:36 +0000 (14:26 -0700)]
Defer removal of activity until animation complete.
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.
Fixes the ugly output associated with bug
13440426.
Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
Scott Main [Tue, 25 Mar 2014 23:46:59 +0000 (23:46 +0000)]
Merge "fix broken link" into klp-docs
Scott Main [Tue, 25 Mar 2014 23:45:40 +0000 (16:45 -0700)]
fix broken link
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
Jean-Michel Trivi [Tue, 25 Mar 2014 17:41:24 +0000 (10:41 -0700)]
Continue refactoring of MediaFocusControl
Move RemoteControlClient death handler and remote playback state
inside MediaController class.
Make MediaController data fields private. Document which accessors
can be removed once the audio focus and media button receiver
mechanisms are dissociated.
Change-Id: Icd14fb0d99bf74512c8f8552d124c0353ce1f06d
Chris Craik [Tue, 25 Mar 2014 17:33:01 +0000 (10:33 -0700)]
Add private circular reveal API on View/RenderNode
Change-Id: I139c8e12b354083149a665f6768f3f6931a8dd15
Ricardo Cervera [Mon, 17 Mar 2014 18:24:24 +0000 (11:24 -0700)]
docs: Added Android Studio build system doc.
Added a document explaning how to use the new build system
in Android Studio.
Change-Id: I45ae1902820c1aaaf4c5810ee683b4d7a5221f16
Ricardo Cervera [Tue, 25 Mar 2014 22:20:14 +0000 (22:20 +0000)]
am
8460e8ff: am
287b5bb2: am
64906b52: am
2564614c: am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
8460e8ffa3c697c63fb092528648351508bc7c7f':
docs: Amend SDK release notes for 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 22:14:37 +0000 (22:14 +0000)]
am
287b5bb2: am
64906b52: am
2564614c: am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
287b5bb241d8ba167836523e3e4fd177534ae928':
docs: Amend SDK release notes for 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 22:08:12 +0000 (22:08 +0000)]
am
64906b52: am
2564614c: am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
64906b52423a9829e7af9ff512fb18b0947f9920':
docs: Amend SDK release notes for 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 22:01:37 +0000 (22:01 +0000)]
am
2564614c: am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
2564614c2ea1927b1bc26f6ac8a39e236c93e922':
docs: Amend SDK release notes for 22.6.2
Will Haldean Brown [Tue, 25 Mar 2014 21:58:01 +0000 (21:58 +0000)]
am
7e98cee6: am
f3f1c7a3: am
63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit '
7e98cee6c2e9770dab9133d7aad6e5affd4a7c40':
Remove all but two micro themes, light and dark.
Will Haldean Brown [Tue, 25 Mar 2014 21:51:55 +0000 (21:51 +0000)]
am
f3f1c7a3: am
63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit '
f3f1c7a3346aa82ab045d037c2ec6e45c5fc2678':
Remove all but two micro themes, light and dark.
Will Haldean Brown [Tue, 25 Mar 2014 21:47:06 +0000 (21:47 +0000)]
am
63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
* commit '
63d161e4ae57b61b33d77f4ea3c91279a6acb807':
Remove all but two micro themes, light and dark.
Will Haldean Brown [Tue, 25 Mar 2014 21:39:17 +0000 (21:39 +0000)]
Merge "Remove all but two micro themes, light and dark." into klp-modular-dev
Justin Koh [Tue, 25 Mar 2014 21:36:39 +0000 (21:36 +0000)]
am
d89929db: am
c635ef99: am
ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
* commit '
d89929db3e010eaa68d8f7c8227f95cdd4fb5179':
Add RobotoCondensed-Light to build.
Ricardo Cervera [Tue, 25 Mar 2014 21:23:57 +0000 (21:23 +0000)]
am
805f3fae: am
917a83da: am
7133208a: am
89a41db0: am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
805f3fae25677d04d71470948d1ad855d5d6d9eb':
docs: Added release notes for Android SDK 22.6.2
Chris Craik [Tue, 25 Mar 2014 21:23:52 +0000 (21:23 +0000)]
am
72cf99ab: am
7e55b35a: am
4118480a: am
80470cdf: Merge "Solve three memory leaks related to PatchCache"
* commit '
72cf99abdb6648f9346b72e0ef6d4da3c4dc9d17':
Solve three memory leaks related to PatchCache
Eino-Ville Talvala [Tue, 25 Mar 2014 21:23:44 +0000 (21:23 +0000)]
am
1559e0b6: (-s ours) am
63d61640: am
55a1e78f: am
1555cec2: am
ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '
1559e0b6a76e089cddc56708ccb177b0d37cc1ba':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Craig Mautner [Tue, 25 Mar 2014 21:23:41 +0000 (21:23 +0000)]
am
f07788b9: am
c89283c5: am
d0955068: am
74e19f57: am
6f955df8: am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
f07788b997e31578da202525ac72d4eec6fe4176':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Scott Main [Tue, 25 Mar 2014 21:23:32 +0000 (21:23 +0000)]
am
1adb8947: am
1cf8117a: am
dc18ce78: am
78373edb: am
837a4885: fix links and add note that adb forward must be repeated bug:
13474515 bug:
13576843
* commit '
1adb8947dae240a11d96450971b3b84d745339c3':
fix links and add note that adb forward must be repeated bug:
13474515 bug:
13576843
Craig Mautner [Tue, 25 Mar 2014 21:23:29 +0000 (21:23 +0000)]
am
ac21f995: am
4f61f6d4: am
e187441b: Merge commit \'
703169a3\' into manualmerge
* commit '
ac21f995e8982c1dd83ba9f6313cf1481f4faf5e':
Don't wait for finishing animation when second display is disconnected
Kenny Root [Tue, 25 Mar 2014 21:23:18 +0000 (21:23 +0000)]
am
266de3ef: am
dd3e6399: am
c1d863e7: am
77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit '
266de3efcd4b57ba3b301d87ff0fb692090d9a95':
Use X509ExtendedTrustManager and not Conscrypt
Craig Mautner [Tue, 25 Mar 2014 21:23:15 +0000 (21:23 +0000)]
am
732d5aaa: am
12b575bd: am
9bbd2f97: (-s ours) am
2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected"
* commit '
732d5aaa3bf50c06f3a7f306221613f4625610f3':
Don't wait for finishing animation when second display is disconnected
Baligh Uddin [Tue, 25 Mar 2014 21:22:44 +0000 (21:22 +0000)]
am
fe74cdcc: (-s ours) am
0a4bd7c9: (-s ours) am
f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '
fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918':
Import translations. DO NOT MERGE
Craig Mautner [Tue, 25 Mar 2014 21:21:45 +0000 (21:21 +0000)]
am
1df9bc5c: am
d7bf82d6: am
f32b22e9: resolved conflicts for merge of
ca903d38 to klp-modular-dev
* commit '
1df9bc5c1d47a09b08d49287d81832e18674bece':
Move task to top in window manager.
Adam Lesinski [Tue, 25 Mar 2014 21:21:21 +0000 (21:21 +0000)]
am
e77786d5: am
99d60784: am
415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev
* commit '
e77786d51f574ca7bbb45df136f92fc7c7d06ffe':
Fix issue with early service start
Baligh Uddin [Tue, 25 Mar 2014 21:21:18 +0000 (21:21 +0000)]
am
fbb3ae6c: (-s ours) am
cdd07216: (-s ours) am
27f67d25: (-s ours) am
29526cca: (-s ours) am
89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '
fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7':
Import translations. DO NOT MERGE
Narayan Kamath [Tue, 25 Mar 2014 21:20:21 +0000 (21:20 +0000)]
am
2c595209: am
163b8655: am
ea96d791: am
5f0d44f6: Merge "Fix scaleNinePatch."
* commit '
2c595209f99103be6572bafe4ad7faf52f81bbcb':
Fix scaleNinePatch.
Scott Main [Tue, 25 Mar 2014 21:20:06 +0000 (21:20 +0000)]
am
f71eebdb: am
686f041e: am
77dc3c00: am
27fa561f: am
52f449fd: fix size and behavior of video thumbnail when flash not available
* commit '
f71eebdb22a251538a81c1fce8d5bf80ce5d7619':
fix size and behavior of video thumbnail when flash not available
Justin Koh [Tue, 25 Mar 2014 21:20:01 +0000 (21:20 +0000)]
am
c635ef99: am
ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
* commit '
c635ef999bae6d48654a9a6b442b6d5d42ff38dd':
Add RobotoCondensed-Light to build.
Ricardo Cervera [Tue, 25 Mar 2014 21:19:53 +0000 (21:19 +0000)]
am
ba6bbb01: am
addeab5c: am
bd48af2c: am
cd64a9ba: am
399b9994: docs: Added release notes for Google APIs System Image v4.
* commit '
ba6bbb01d4f8b60c3c124797700122b717a2a5c4':
docs: Added release notes for Google APIs System Image v4.
Matthew Williams [Tue, 25 Mar 2014 21:19:49 +0000 (21:19 +0000)]
am
2c672973: (-s ours) am
4bcf922a: am
c798e4f5: am
4701b51a: am
bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule.
* commit '
2c6729735290140959a7102afea3320d257d1f42':
DO NOT MERGE: Downgrade expedited to normal on reschedule.
Scott Main [Tue, 25 Mar 2014 21:19:42 +0000 (21:19 +0000)]
am
b8a79fce: am
941eabc2: am
e9b50e75: am
9d8184e7: am
779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions
* commit '
b8a79fcef37dba36733dc25064b40f706a13fc7a':
update wear homepage with layout fixes and replace GIFs with smaller versions
Selim Cinek [Tue, 25 Mar 2014 21:18:45 +0000 (21:18 +0000)]
am
50cd7c39: am
f7805dd7: am
7290b56b: am
8ae8689d: am
c41853ce: Fixed wallpaper bug where wrong size was taken when cropping
* commit '
50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
Fixed wallpaper bug where wrong size was taken when cropping
Ricardo Cervera [Tue, 25 Mar 2014 21:13:54 +0000 (21:13 +0000)]
am
39aed838: docs: Amend SDK release notes for 22.6.2
* commit '
39aed838f505314fe6f1947e39de79de2f84ba40':
docs: Amend SDK release notes for 22.6.2
Justin Koh [Tue, 25 Mar 2014 21:13:53 +0000 (21:13 +0000)]
am
ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
* commit '
ec5b6e8726a215ff912bbbf872b8bdf600a74e1e':
Add RobotoCondensed-Light to build.
Justin Koh [Tue, 25 Mar 2014 21:01:55 +0000 (21:01 +0000)]
Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
Gabriel Peal [Tue, 25 Mar 2014 20:59:04 +0000 (20:59 +0000)]
Merge "resolved conflicts for merge of
c1edfc2c to master"
Zhijun He [Tue, 25 Mar 2014 20:54:55 +0000 (20:54 +0000)]
Merge "Camera2: Add partial flash state"
Ricardo Cervera [Tue, 25 Mar 2014 20:50:55 +0000 (13:50 -0700)]
docs: Amend SDK release notes for 22.6.2
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
Gabriel Peal [Tue, 25 Mar 2014 20:49:51 +0000 (13:49 -0700)]
resolved conflicts for merge of
c1edfc2c to master
Change-Id: I95d690e5f0895c1dbfd911f345703f0f562be447
Zhijun He [Tue, 25 Mar 2014 20:49:30 +0000 (13:49 -0700)]
Camera2: Add partial flash state
Bug
13637334
Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
Adam Lesinski [Tue, 25 Mar 2014 20:49:08 +0000 (20:49 +0000)]
Merge "Shared library resource support"
Ricardo Cervera [Tue, 25 Mar 2014 20:49:05 +0000 (20:49 +0000)]
am
917a83da: am
7133208a: am
89a41db0: am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
917a83da70d7007abfb3edd85b07a1f8a058af9b':
docs: Added release notes for Android SDK 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 20:43:23 +0000 (20:43 +0000)]
am
7133208a: am
89a41db0: am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
7133208a816dc3eedf9c45309112c05f7d9136e0':
docs: Added release notes for Android SDK 22.6.2
Gabriel Peal [Wed, 19 Mar 2014 23:41:49 +0000 (16:41 -0700)]
resolved conflicts for merge of
c1edfc2c to master
attempt 2
Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
Will Haldean Brown [Tue, 25 Mar 2014 20:38:33 +0000 (13:38 -0700)]
Remove all but two micro themes, light and dark.
Bug:
13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
Ricardo Cervera [Tue, 25 Mar 2014 20:36:42 +0000 (20:36 +0000)]
am
89a41db0: am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
89a41db09a0a4935a111777e12c01a40765d20be':
docs: Added release notes for Android SDK 22.6.2
Chris Craik [Tue, 25 Mar 2014 20:36:15 +0000 (20:36 +0000)]
am
7e55b35a: am
4118480a: am
80470cdf: Merge "Solve three memory leaks related to PatchCache"
* commit '
7e55b35a603fe64e8db2c6050a1b778baaccd920':
Solve three memory leaks related to PatchCache
Chris Craik [Tue, 25 Mar 2014 20:28:00 +0000 (20:28 +0000)]
am
4118480a: am
80470cdf: Merge "Solve three memory leaks related to PatchCache"
* commit '
4118480aabb4a7b332e289ebb71d2e4f9bc05d7e':
Solve three memory leaks related to PatchCache
Ricardo Cervera [Tue, 25 Mar 2014 20:27:51 +0000 (20:27 +0000)]
am
825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
* commit '
825280d2ac85cef7ec1f096b02006c26dba0374a':
docs: Added release notes for Android SDK 22.6.2
Ricardo Cervera [Tue, 25 Mar 2014 20:22:58 +0000 (20:22 +0000)]
Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs
Eino-Ville Talvala [Tue, 25 Mar 2014 20:21:33 +0000 (20:21 +0000)]
am
63d61640: am
55a1e78f: am
1555cec2: am
ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev
* commit '
63d61640d41b85b32ca7287235ca638731555b63':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Craig Mautner [Tue, 25 Mar 2014 20:21:30 +0000 (20:21 +0000)]
am
c89283c5: am
d0955068: am
74e19f57: am
6f955df8: am
550b44d1: am
f4644189: am
4cf6286c: am
02c7ba73: am
41bb0637: am
76e85eec: am
3bc9971d: am
95d6e32b: am
86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit '
c89283c5863855fadd8853e524e36e19aaaf142a':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
OSDN Git Service
