OSDN Git Service
Doris Liu [Sat, 29 Aug 2015 01:35:36 +0000 (18:35 -0700)]
A new test for AnimatorSet's clone
Set up an AnimatorSet, and make the first clone during the animation run, and
the second after the run. Add one listener to each animator. When the clones
animate, listeners of both the clones and the animator being cloned should
receive animation lifecycle events.
Change-Id: I197440e2cd404592eb29be76864a66a0d110a9a5
Doris Liu [Fri, 28 Aug 2015 20:21:03 +0000 (13:21 -0700)]
Correct isRunning() behavior for AnimatorSet
isRunning() for an Animator indicates whether an animator has gone
past its start delay and not yet finished. As a subclass of Animator,
AnimatorSet should follow the same principle. The implemention prior
to this CL returns whether any child animation is running, which is
inconsistent with the javadoc for isRunning() and general behavior
for Animator.
Change-Id: Iece814dfcd609ee292dbc00bd55dc64c7bda8e57
Doris Liu [Thu, 27 Aug 2015 23:21:14 +0000 (23:21 +0000)]
Merge "Add test that calls cancel() from onAnimationEnd(Animator)"
Doris Liu [Thu, 27 Aug 2015 23:20:55 +0000 (23:20 +0000)]
Merge "Prevents recursive call into end() or cancel()"
Doris Liu [Thu, 27 Aug 2015 21:56:30 +0000 (14:56 -0700)]
Prevents recursive call into end() or cancel()
end() and cancel() in ValueAnimator will trigger onAnimationCancel
or onAnimationEnd callback on its listeners. If additional end()
or cancel() request comes from the callback, a loop will be formed.
Therefore, we need to mark when the end is reuqested so we do not
process end() or cancel() request multiple times during one animation
run, and also effectively terminate the loop.
Bug:
23596652
Change-Id: Iefb69eb8969071b43124c09d7cccbe9ff5ba5dcc
Doris Liu [Thu, 27 Aug 2015 22:51:10 +0000 (15:51 -0700)]
Add test that calls cancel() from onAnimationEnd(Animator)
and end() from onAnimationCancel(Animator). No recursive calling
should happen.
Bug:
23596652
Change-Id: I50e223a3de6d31697bee6515668b9732195a261f
Kyle Horimoto [Thu, 27 Aug 2015 23:09:42 +0000 (23:09 +0000)]
Merge "Use SparseIntArray as performance optimization."
Kyle Horimoto [Wed, 26 Aug 2015 04:03:38 +0000 (21:03 -0700)]
Use SparseIntArray as performance optimization.
This reduces the amount of space (and auto-boxing) needed to support the grid model.
Change-Id: Iaf5e6792df519cb94b5ee9f23d15cff1d60fa67d
Kyle Horimoto [Thu, 27 Aug 2015 22:49:04 +0000 (22:49 +0000)]
Merge "Fix band select UI issue."
Kyle Horimoto [Wed, 26 Aug 2015 00:12:42 +0000 (17:12 -0700)]
Fix band select UI issue.
The issue was that scrolling past the top or bottom of the view caused the band
select rectangle to grow in the wrong direction. This was caused by adjusting
the origin of the band select rectangle based on the calculated number of pixels
to scroll instead of the actual number of pixels scrolled. There can be a
discrepancy when the calculated value is higher than the maximum that can be
scrolled (when the view is already scroll almost to the top or bottom of the
view).
Bug:
23081362
Change-Id: I343cdec89260ab0571a792009d0c08585ed41199
Ajay Panicker [Thu, 27 Aug 2015 22:07:19 +0000 (22:07 +0000)]
am
53b1884a: am
30aa53c7: am
92fb5342: am
c07701f2: am
3e5b0118: Merge "Add StateMachine.removeDeferredMessages()" into mnc-dev
* commit '
53b1884ac66f33614393013ffa1bfd89564d178b':
Add StateMachine.removeDeferredMessages()
Eric Laurent [Thu, 27 Aug 2015 22:07:01 +0000 (22:07 +0000)]
am
48037082: am
155c1ad1: am
38f6f487: am
aef51d09: am
4a8034ca: AudioTrack: error reporting for getTimestamp()
* commit '
4803708270d067ca8dfe502a2ce8eb78536742eb':
AudioTrack: error reporting for getTimestamp()
Adrian Roos [Thu, 27 Aug 2015 22:06:49 +0000 (22:06 +0000)]
am
f094bde1: am
c63a12b7: am
6fe373b1: am
16d7245b: Merge "Prevent Fingerprint when SIM is locked" into mnc-dr-dev
* commit '
f094bde15dbbe305d594e11dff5fa22737b93c2c':
Prevent Fingerprint when SIM is locked
Kyle Horimoto [Thu, 27 Aug 2015 21:48:25 +0000 (21:48 +0000)]
Merge "Integrate band selection into the files app."
Kyle Horimoto [Tue, 18 Aug 2015 20:25:29 +0000 (13:25 -0700)]
Integrate band selection into the files app.
This consists of:
1) Moving both BandSelect* classes into MultiSelectManager as nested
classes. This removes extra layers of indirection and makes code easier
to comprehend.
2) Fixing an issue where band selection could start within an item
instead of only within margins between items.
3) Adding "provisional selection" support to the Selection class. This
gives band select the ability to select some items "temporarily" such
that when the band select no longer covers those items, they are
deselected.
4) Adding glue code between the classes.
Bug:
23081429,
23083146,
20669231
Change-Id: I0dc57e2c0d2ccedb3e1218f0e496de637be227a2
Doris Liu [Thu, 27 Aug 2015 20:48:32 +0000 (20:48 +0000)]
Merge "Fix build"
Doris Liu [Thu, 27 Aug 2015 20:40:07 +0000 (13:40 -0700)]
Fix build
Change-Id: Ib454858f0fe3eb9171297c2c1ccece33729c487b
Alan Viverette [Thu, 27 Aug 2015 20:14:19 +0000 (20:14 +0000)]
am
88b579a1: am
3b83e5bf: (-s ours) am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
88b579a1ac912aa00ddf82afb059cda8ff47f732':
Chien-Yu Chen [Thu, 27 Aug 2015 20:14:11 +0000 (20:14 +0000)]
am
bd6bb64f: am
44674d69: (-s ours) am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
bd6bb64f4ac70bb0c578350e1ed551c3295ef8cd':
Nicholas Sauer [Thu, 27 Aug 2015 20:14:03 +0000 (20:14 +0000)]
am
a7e4a2c5: am
028ef11a: (-s ours) am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
a7e4a2c528bb2f6aedcd77ea4a20ed154f3f5bf9':
Alan Viverette [Thu, 27 Aug 2015 20:13:56 +0000 (20:13 +0000)]
am
d8132b34: am
332bdb16: (-s ours) am
8b73003f: am
ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"
* commit '
d8132b34edbb798e33b0fe7ce2d91b47d9963d25':
Todd Kennedy [Thu, 27 Aug 2015 20:13:48 +0000 (20:13 +0000)]
am
fbb31b4a: am
635c9915: (-s ours) am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
fbb31b4a9c40c1cec6a7e5310784b02aeb36d3ed':
Chris Tate [Thu, 27 Aug 2015 20:13:40 +0000 (20:13 +0000)]
am
25169314: am
555f91db: (-s ours) am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
251693142db59cd72cfedcadc28cbc96d88dc7b5':
Raph Levien [Thu, 27 Aug 2015 20:13:32 +0000 (20:13 +0000)]
am
f15aaf55: am
98efab2d: (-s ours) am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
f15aaf55d67d1644888df43374b7df7cdcb91213':
Nicolas Prevot [Thu, 27 Aug 2015 20:13:24 +0000 (20:13 +0000)]
am
bd3e0b2f: am
cd5c678d: (-s ours) am
d34ecae4: Don\'t set a null filter to a cross-profile ResolveInfo.
* commit '
bd3e0b2f04fb298b2a6335b33e51b8d30bdadf0f':
Eino-Ville Talvala [Thu, 27 Aug 2015 20:13:14 +0000 (20:13 +0000)]
am
a9bee8a4: am
d14e1f2f: (-s ours) am
2bf7b98a: Merge "Camera2: Remove filtering for non-BURST_CAPTURE-capable devices" into mnc-dev
* commit '
a9bee8a42e634d5a8efcfe3334110f5fed443da2':
Adrian Roos [Thu, 27 Aug 2015 20:13:06 +0000 (20:13 +0000)]
am
aaa5f9c2: am
4b93324d: (-s ours) am
def6896d: Fix shifted wallpaper after OTA
* commit '
aaa5f9c2799ef8ee63b94b3afdd139cfaab73f8d':
Joe Fernandez [Thu, 27 Aug 2015 20:12:57 +0000 (20:12 +0000)]
am
748fdf2b: am
76d4d5d1: (-s ours) am
c550a6fa: Merge "docs: Add Studio 1.3.2 release notes and download links" into mnc-dev
* commit '
748fdf2bb519f9b76dca77c9cf2962ba5c2971b5':
Scott Main [Thu, 27 Aug 2015 20:12:47 +0000 (20:12 +0000)]
am
9d208e9d: am
1112cbe6: (-s ours) am
c04d21fc: Merge "add placeholder for platform name in download button. This change depends on the following change to the script that loads the platform name... https://googleplex-android-review.git.corp.google.com/#/c/752776/" i
* commit '
9d208e9d274b84636cf317aa43bae1af63face2c':
Eino-Ville Talvala [Thu, 27 Aug 2015 20:12:40 +0000 (20:12 +0000)]
am
d24943d9: am
d803ef13: (-s ours) am
08b12dfb: Merge "Camera2: Legacy: Lock down surface sizes before creating EGL surfaces" into mnc-dev
* commit '
d24943d9f62170425bbeb05d10bff15b85a7dcbe':
Andrew Solovay [Thu, 27 Aug 2015 20:12:32 +0000 (20:12 +0000)]
am
8099aff3: am
ebd845bf: (-s ours) am
9520071b: Merge "docs: Fix return info for support lib checkSelfPermission()" into mnc-dev
* commit '
8099aff327d9e7265924e18d8d313c1967057f74':
Eino-Ville Talvala [Thu, 27 Aug 2015 20:12:24 +0000 (20:12 +0000)]
am
9889eb09: am
a52995cc: (-s ours) am
a7dde2e8: Merge "Camera: Fix depth documentation issues" into mnc-dev
* commit '
9889eb093efd26cb84a07bdeb6fcdf92cc86938f':
Glenn Kasten [Thu, 27 Aug 2015 20:12:16 +0000 (20:12 +0000)]
am
afef9e30: am
b2c6413c: (-s ours) am
d9eef347: Merge "MIDI docs: fix buffer allocation" into mnc-dev
* commit '
afef9e30bcaef86eb95e298b648cfb3e17467be5':
Cheryl Potter [Thu, 27 Aug 2015 20:12:02 +0000 (20:12 +0000)]
am
0909f203: am
f152540a: (-s ours) am
41fc973c: am
251f2479: am
dc35d48f: Merge "docs: changed red to yellow in code snippet" into mnc-preview-docs
* commit '
0909f203337288b928dec019523ae978bf05555c':
Fyodor Kupolov [Thu, 27 Aug 2015 20:11:54 +0000 (20:11 +0000)]
am
dead26b7: am
950297d2: (-s ours) am
e6c64508: Merge "Fixed a typo in convertRestrictionsToBundle JavaDoc" into mnc-dev
* commit '
dead26b73f1d2f6405bfea6a1f7464df55d5d157':
Stephen Hines [Thu, 27 Aug 2015 20:11:46 +0000 (20:11 +0000)]
am
4cbc6d4f: am
c5aa1bc9: (-s ours) resolved conflicts for merge of
da1173f4 to mnc-dev-plus-aosp
* commit '
4cbc6d4f63dc541ac90bfb31ae73471d73202b54':
Jim Miller [Thu, 27 Aug 2015 20:11:38 +0000 (20:11 +0000)]
am
6c2862ed: am
d8f61f20: (-s ours) am
74d9c2aa: Merge "Fix type-o in FingerprintManager documentation" into mnc-dev
* commit '
6c2862ed08f34a3f43a190e44e9b1b5a2dcff35e':
Tom Cherry [Thu, 27 Aug 2015 20:11:30 +0000 (20:11 +0000)]
am
0a3ef41a: am
9f5e9ec7: (-s ours) am
b9ac485a: am
49948146: Merge "bundle init.rc contents with its service"
* commit '
0a3ef41a31dcc6077ba3839835b2b301416b6caf':
Svetoslav Ganov [Thu, 27 Aug 2015 20:11:22 +0000 (20:11 +0000)]
am
062a865f: am
04a1cac9: (-s ours) am
cb59747d: Merge "Add missing removed permissions to the platform manifest" into mnc-dev
* commit '
062a865ff8e3d163757d3bc724e77cc94563751f':
Sebastien Hertz [Thu, 27 Aug 2015 20:11:14 +0000 (20:11 +0000)]
am
2dfeccc0: (-s ours) am
fcb005d1: (-s ours) am
7cd2d343: am
852c6178: (-s ours) am
b63e291d: am
88556ac2: am
599dc2bd: am
50af68e7: am
55f86b18: (-s ours) am
9e7a0ddb: am
18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE
* commit '
2dfeccc0c13b2f9f117b23c400b4361ecc48409b':
Sebastien Hertz [Thu, 27 Aug 2015 20:11:03 +0000 (20:11 +0000)]
am
69ee2b6b: am
d5241d83: (-s ours) am
c5151d2c: am
b60bc0ec: resolved conflicts for merge of
a2d19318 to lmp-mr1-ub-dev
* commit '
69ee2b6b43de666162c998f935197fb0d00065c7':
Christopher Tate [Thu, 27 Aug 2015 20:10:54 +0000 (20:10 +0000)]
am
7b2e3129: am
1ae064d6: (-s ours) am
ddc2536d: Make sure to kill restore-at-install full-data targets after restore
* commit '
7b2e3129b2f4dc64ca30009ad292a6d491ceac0c':
Alan Viverette [Thu, 27 Aug 2015 20:10:46 +0000 (20:10 +0000)]
am
643055a1: am
0f84781b: (-s ours) am
54c807e7: Merge "Translate ripple mask to account for drawable bounds" into mnc-dev
* commit '
643055a12a3ee445abd2273b34516427126e2baf':
Chong Zhang [Thu, 27 Aug 2015 20:10:34 +0000 (20:10 +0000)]
am
5c7bea49: am
9f38dd3d: (-s ours) am
7efe9f67: am
5923d161: Merge "wm: call displayReady for all built in displays when system is ready."
* commit '
5c7bea4947d294d51679d5c62cf25c1cf6fc40a9':
Fyodor Kupolov [Thu, 27 Aug 2015 20:10:22 +0000 (20:10 +0000)]
am
eb37a244: am
8a363bb1: (-s ours) am
1773ded8: Merge "Fixed key comparison in equals method" into mnc-dev
* commit '
eb37a244c0c4adc55698afb3bd3a05095d149c11':
Elliott Hughes [Thu, 27 Aug 2015 20:10:12 +0000 (20:10 +0000)]
am
e3757d6e: am
1262059c: (-s ours) am
260cb53f: am
ce4fbb4d: Merge "zygote: fix memory leak when fork process"
* commit '
e3757d6e1e27c3a4c06bc1e797e56ad88a37d5dd':
David Friedman [Thu, 27 Aug 2015 20:09:54 +0000 (20:09 +0000)]
am
db22d45a: am
5bc17ad2: (-s ours) am
46eddef4: am
504623e1: am
5389f46c: Docs: Fixes to interactive-watch-face docs (CL 743190)
* commit '
db22d45af9dcf94dd138db6467de8d069a7f932b':
Dianne Hackborn [Thu, 27 Aug 2015 20:09:43 +0000 (20:09 +0000)]
am
cdfac851: am
0171f382: (-s ours) am
c14cbac4: Merge "Fix issue #
23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev
* commit '
cdfac851ff301dd592dfc4ab2f5be7fbc9a34717':
Jeff Sharkey [Thu, 27 Aug 2015 20:09:30 +0000 (20:09 +0000)]
am
aeec01c2: am
746aee22: (-s ours) am
f3ad1eab: Merge "Pass underlying volume UUID to StorageVolume." into mnc-dev
* commit '
aeec01c2ee2bb6b6a937bf1140dd87b1f7673c8a':
David Friedman [Thu, 27 Aug 2015 20:09:21 +0000 (20:09 +0000)]
am
1ed472dc: am
8e79119c: (-s ours) am
6a21a5a1: am
9f4ddca9: am
56c22d29: Merge "Docs: Creating interactive watch faces Bug:
21721463" into mnc-preview-docs
* commit '
1ed472dc242a0990d87f8827b049c47c45a2cc8c':
David Friedman [Thu, 27 Aug 2015 20:09:06 +0000 (20:09 +0000)]
am
db8d1c53: am
afee154d: (-s ours) am
6540375a: am
311f8eee: am
ed54f60a: Merge "Docs: Updating, clarifying Debug-over-WiFi instructions. Bug:
21371836" into mnc-preview-docs
* commit '
db8d1c53cbeeef55855b643f0ce4928bc362f07c':
Tyler Gunn [Thu, 27 Aug 2015 20:08:56 +0000 (20:08 +0000)]
am
8d61bcd8: am
4f03dfe7: (-s ours) am
1e9bfc64: Fix incorrect android.telecom.Call.Details equality check.
* commit '
8d61bcd897f7eb581f39ff9a2a1c2683a43312dd':
Lorenzo Colitti [Thu, 27 Aug 2015 20:08:45 +0000 (20:08 +0000)]
am
72ef82c4: am
c4b6cee6: (-s ours) am
11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
* commit '
72ef82c41414882029ddacef749b7f26bcad46db':
Amith Yamasani [Thu, 27 Aug 2015 20:08:36 +0000 (20:08 +0000)]
am
9658da68: am
8f3ef070: (-s ours) am
e3de6c5d: Merge "Fix crashes when removing work profile" into mnc-dev
* commit '
9658da681c1d59dabdf418c139f8d67eab1ad902':
Dianne Hackborn [Thu, 27 Aug 2015 20:08:23 +0000 (20:08 +0000)]
am
c76cbe96: am
4519b64f: (-s ours) am
29cd8808: Merge "Fix issue #
23326715: Clarify --checkin/-c options in batterystats" into mnc-dev
* commit '
c76cbe96e92a9e279922ab57202b6182e1127fce':
Elliott Hughes [Thu, 27 Aug 2015 20:08:14 +0000 (20:08 +0000)]
am
ab4ebeb8: am
c301ab8d: (-s ours) Move aapt2 off HAVE_MS_C_RUNTIME.
* commit '
ab4ebeb8f8f2aa40f735442ad229166f36b4839c':
Move aapt2 off HAVE_MS_C_RUNTIME.
Jorim Jaggi [Thu, 27 Aug 2015 20:08:04 +0000 (20:08 +0000)]
am
68139f95: am
127a0d16: (-s ours) am
8b8fa3e9: Fix SysUI crash when no metadata is provided
* commit '
68139f9585d66c1d3bb1207952078bc9b388ed5b':
Jorim Jaggi [Thu, 27 Aug 2015 20:07:56 +0000 (20:07 +0000)]
am
d398e3fc: am
265b194f: (-s ours) am
f610bd78: Fix race conditions for camera prewarm service
* commit '
d398e3fc048aa06588148002aad7590d23245978':
Chris Craik [Thu, 27 Aug 2015 20:07:48 +0000 (20:07 +0000)]
am
07384a7e: am
fc7f6197: (-s ours) am
0b804542: Merge "Constrain drawBitmap matrix-to-rect optimization" into mnc-dev
* commit '
07384a7e536ce252410f1053793969711c34879d':
Tenghui Zhu [Thu, 27 Aug 2015 20:07:39 +0000 (20:07 +0000)]
am
9501c9b7: am
605f4b88: (-s ours) am
c9ecc985: Merge "Add some bookmarks to plugin-for-gradle page" into mnc-dev
* commit '
9501c9b79fb37fe0a11c3924b0837bcb12acc0a9':
Quddus Chong [Thu, 27 Aug 2015 20:07:30 +0000 (20:07 +0000)]
am
bba904d7: am
35796dc7: (-s ours) am
54bdb2e7: Merge "docs: Updated hardware system images for M." into mnc-dev
* commit '
bba904d7096535d3b2fb3ff0d99c685a7d54d02d':
Adam Lesinski [Thu, 27 Aug 2015 20:07:19 +0000 (20:07 +0000)]
am
615fc09c: am
750598f8: (-s ours) am
886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev
* commit '
615fc09cbdb5b598547d5c2e0f9112b1467ac972':
Jim Miller [Thu, 27 Aug 2015 20:07:09 +0000 (20:07 +0000)]
am
29bea9d4: am
af22fa7b: (-s ours) am
448216e7: Merge "Revert "Disable fingerprint when remotely reset by DPM"" into mnc-dev
* commit '
29bea9d4bb13fa1dfbbfb9bbb63c996ec9111eef':
Roozbeh Pournader [Thu, 27 Aug 2015 20:06:54 +0000 (20:06 +0000)]
am
1dda3a3c: am
a0a6d2c5: (-s ours) am
53c38c88: Merge "Revert "Create a special CONSTRAINED font bucket in frameworks."" into mnc-dev
* commit '
1dda3a3ca7109eed4395c049b770b14d85c5ca18':
Dianne Hackborn [Thu, 27 Aug 2015 20:06:44 +0000 (20:06 +0000)]
am
eb1ccc7d: am
c8869f93: (-s ours) am
af75c17b: Fix issue #
23270878: NPE in UsageStatsService while running UserManagementTest
* commit '
eb1ccc7d1bfdba2e4db65b143ee9178ef70ec871':
Tao Bao [Thu, 27 Aug 2015 20:06:33 +0000 (20:06 +0000)]
am
ab771bef: am
9d995335: (-s ours) am
2e3746ab: am
9bcb0fcc: Merge "Recursively delete directories in handleAftermath()."
* commit '
ab771befa5cef61d0bdcb727b8c0319cb4cb9eef':
Sebastien Hertz [Thu, 27 Aug 2015 20:06:22 +0000 (20:06 +0000)]
am
e21195e7: am
e9538685: (-s ours) am
9a010d0a: Merge "Allow debugging only for apps forked from zygote" into mnc-dev
* commit '
e21195e73321822385d8af6b00c2042bef0cc0b1':
Joe Fernandez [Thu, 27 Aug 2015 20:06:06 +0000 (20:06 +0000)]
am
5558ed54: am
cfdc3640: (-s ours) am
96695d2f: Merge "docs: App link doc update for M Preview 3" into mnc-dev
* commit '
5558ed54331e8201d07a980c120d9e31765b96d9':
David Friedman [Thu, 27 Aug 2015 20:05:56 +0000 (20:05 +0000)]
am
1b8eb5f2: am
82a1f1bc: (-s ours) am
3e40a27e: Merge "Docs: Fixing files that didn\'t merge properly from mnc-preview-docs" into mnc-dev
* commit '
1b8eb5f226fc95821e9a37ee2066e5cdc39af46a':
Filip Gruszczynski [Thu, 27 Aug 2015 20:05:38 +0000 (20:05 +0000)]
am
fe63ed54: am
e6c34f89: (-s ours) am
610008c0: Merge "Clear old clip rect when creating new surface." into mnc-dev
* commit '
fe63ed548c370e177fa151cce3fb0076ac818037':
Dianne Hackborn [Thu, 27 Aug 2015 20:05:26 +0000 (20:05 +0000)]
am
a0b9bbe7: am
59fa0448: (-s ours) am
12b9c2d6: Merge "Fix issue #
23214751: Get a GPS fix before going in to doze" into mnc-dev
* commit '
a0b9bbe769a131fcfc33ab95db760d299221cbf5':
Chris Tate [Thu, 27 Aug 2015 20:05:15 +0000 (20:05 +0000)]
am
96b6acda: am
8b52be33: (-s ours) am
c0a2254e: Merge "Clean up properly if outcall for doRestoreFinished() fails" into mnc-dev
* commit '
96b6acdaf0ffabd6fb1f49b032350805d8721dc5':
Quddus Chong [Thu, 27 Aug 2015 20:05:03 +0000 (20:05 +0000)]
am
e5d6b3b9: am
f6e67197: (-s ours) am
7aa6fc67: Merge "docs: Re-added gms_lists.js and gcm_lists.js for GMS v7.8 (Reblochon) Javadoc discovery." into mnc-dev
* commit '
e5d6b3b94c8bfb6280b728a8e20f8bbc5d7fe366':
Joe Fernandez [Thu, 27 Aug 2015 20:04:52 +0000 (20:04 +0000)]
am
936ac95a: am
910ee26e: (-s ours) am
036895e1: Merge "docs: M Preview 3 post-release cleanup" into mnc-dev
* commit '
936ac95aed1cfbaba8c573f3cfbac771d828636a':
Amit Mahajan [Thu, 27 Aug 2015 20:04:42 +0000 (20:04 +0000)]
am
28ed4fc7: am
1091665c: (-s ours) am
dd8df041: Merge "Setting config_use_sim_language_file to false for 334-020." into mnc-dev
* commit '
28ed4fc7972eeb90a3697c96c602f5de380568c8':
Jorim Jaggi [Thu, 27 Aug 2015 20:04:27 +0000 (20:04 +0000)]
am
95a00a75: am
f7875f80: (-s ours) am
757e2c7f: Merge "Fix documentation issue" into mnc-dev
* commit '
95a00a751327647bdb571341398de9800da33dc3':
Elliott Hughes [Thu, 27 Aug 2015 20:04:17 +0000 (20:04 +0000)]
am
674f2870: am
bda7780d: (-s ours) am
12cf0f9c: am
eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools."
* commit '
674f28704d9734946ffbfa703da0d5e0e768350b':
Joe Fernandez [Thu, 27 Aug 2015 20:04:05 +0000 (20:04 +0000)]
am
8c1be8a2: am
1090412f: (-s ours) am
46ae218b: Merge "docs: Support Library v23 updates" into mnc-dev
* commit '
8c1be8a2f6102a07f1479d16a6e56dad955fac53':
Dirk Dougherty [Thu, 27 Aug 2015 20:03:55 +0000 (20:03 +0000)]
am
6c19752d: am
ce17f53e: (-s ours) am
bd58d6fc: Doc change: misc fixes for preview 3.
* commit '
6c19752d1201da4a7055e7f9776b20d92bb6b50f':
Junda Liu [Thu, 27 Aug 2015 20:03:45 +0000 (20:03 +0000)]
am
d43d9a87: am
261ef07b: (-s ours) am
f2cb6f7e: Merge "Grant SMS carrier provisioning app the permission to receive SMS." into mnc-dev
* commit '
d43d9a8776b7388cb933c7866166a806b5c2a9e2':
Chris Tate [Thu, 27 Aug 2015 20:03:25 +0000 (20:03 +0000)]
am
9c263f8e: am
44bb9629: (-s ours) am
a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev
* commit '
9c263f8e115e5b7bb46f10b0bd51c7688822b861':
Quddus Chong [Thu, 27 Aug 2015 20:03:12 +0000 (20:03 +0000)]
am
9585ccc2: am
490d6b5d: (-s ours) am
a03567bf: docs: Fixed unclosed anchor tag for M Program Overview.
* commit '
9585ccc2bf17620185376eb72e1f7903504b0038':
Andrew Solovay [Thu, 27 Aug 2015 20:03:03 +0000 (20:03 +0000)]
am
f081d26e: am
ad7d95bd: (-s ours) am
af46e1b4: resolved conflicts for merge of
44053b4e to mnc-dev
* commit '
f081d26ecc26e88c10aca8a8cc3598e5dc4504d6':
Quddus Chong [Thu, 27 Aug 2015 20:02:43 +0000 (20:02 +0000)]
am
3609c555: am
dbfa65dd: (-s ours) am
ed7961eb: Merge "docs: Fixed typo in Android for Work section in MNC Behavior Changes doc." into mnc-dev
* commit '
3609c5552f78a350762b82ed4f581961ef60b4f4':
Eric Gilmore [Thu, 27 Aug 2015 20:02:33 +0000 (20:02 +0000)]
am
8483cea7: am
ffc3da39: (-s ours) am
9b3c0bc9: am
398d655f: am
d381eb95: Merge "Adding link to location API video." into mnc-preview-docs
* commit '
8483cea7f3bd89c06a9f72362c237fbf58c1372a':
Rich Sloager [Thu, 27 Aug 2015 20:02:25 +0000 (20:02 +0000)]
am
11c4e138: am
67ff0c99: (-s ours) am
7f328d98: am
08b3f121: am
72c1f222: Merge "docs: studio 1.3.1 revision updates" into mnc-preview-docs
* commit '
11c4e1385500727ccc38846298cc5f7b0e7189e4':
Rich Sloager [Thu, 27 Aug 2015 20:02:17 +0000 (20:02 +0000)]
am
0e01cc2d: am
9adb76b9: (-s ours) am
50a16111: am
285c9cb7: am
4f66c1da: Merge "docs: studio 1.3.1 download updates" into mnc-preview-docs
* commit '
0e01cc2d01c8bacfe05bf6810fbd2f18f38b96cf':
Cheryl Potter [Thu, 27 Aug 2015 20:02:08 +0000 (20:02 +0000)]
am
5a47c38c: am
36bde447: (-s ours) am
a5913fbb: am
a2f11f81: am
caec50ec: docs: changed version 5 to 3 for Billing API
* commit '
5a47c38c80475c688d5d91eefd49f11fc8de94ee':
Quddus Chong [Thu, 27 Aug 2015 20:02:00 +0000 (20:02 +0000)]
am
708b2e2e: am
2ad15414: (-s ours) am
3f90a43c: am
98d2d0d5: am
862f0f03: doc: Updated Auto quality guideline for media playback (AU-MT). The update reflects new guidance that media apps do not autoplay on startup of Android Auto or without user initia
* commit '
708b2e2ed4ce31c68c78d5be0736c7853fca8742':
Rich Sloager [Thu, 27 Aug 2015 20:01:52 +0000 (20:01 +0000)]
am
3f861956: am
49a84760: (-s ours) am
96b2c10d: am
55ee752e: am
c5b58011: Merge "docs: gradle plugin revision update" into mnc-preview-docs
* commit '
3f861956a0436fb934b3060fab58606309832ba6':
Joe Fernandez [Thu, 27 Aug 2015 20:01:44 +0000 (20:01 +0000)]
am
09a8b961: am
f2032ec7: (-s ours) am
f71cc012: am
9186895b: am
5fd0eff1: docs: August 2015 Android Dashboard update
* commit '
09a8b961d0250296b935710d043fde47aa617284':
Rich Sloager [Thu, 27 Aug 2015 20:01:35 +0000 (20:01 +0000)]
am
aa528851: am
c998eb70: (-s ours) am
d00a5b1b: am
998f5501: am
378a3a89: Merge "docs: studio 1.3 annotation-update" into mnc-preview-docs
* commit '
aa528851c5b2cf52359da6d19d5dbd3d49ea87ba':
Rich Slogar [Thu, 27 Aug 2015 20:01:26 +0000 (20:01 +0000)]
am
0a709c76: am
d71a5829: (-s ours) am
43c8a1c8: am
3ee95327: am
6c00399c: docs: studio 1.3 private resources
* commit '
0a709c76bc7bd6736b7f6a116d4ee82578d2a4c1':
Rich Slogar [Thu, 27 Aug 2015 20:01:16 +0000 (20:01 +0000)]
am
a910d7a6: am
3d7e0b42: (-s ours) am
1614f115: am
8f0d5451: am
e5fe2468: docs: studio 1.3 allocation tracker
* commit '
a910d7a633d47497bbd8e2a37a7711d283f5cc64':
Rich Slogar [Thu, 27 Aug 2015 20:01:03 +0000 (20:01 +0000)]
am
dc3b0b9b: am
04a72e87: (-s ours) am
605c890b: am
860e65be: am
16c5726e: docs: studio 1.3 developer services
* commit '
dc3b0b9b8ea76af31720f21870a2818dd8935f3f':
Rich Sloager [Thu, 27 Aug 2015 20:00:54 +0000 (20:00 +0000)]
am
ea035392: am
5cadd055: (-s ours) am
30996739: am
e62df60a: am
b90583ac: Merge "docs: create-project-link in studio overview" into mnc-preview-docs
* commit '
ea0353923f86dee0250e409b3064c7b13da650ff':
Rich Sloager [Thu, 27 Aug 2015 20:00:44 +0000 (20:00 +0000)]
am
792fce78: am
17769abf: (-s ours) am
c6bfe586: am
ccd0fe27: am
c87ca50a: Merge "docs: studio 1.3 downloads" into mnc-preview-docs
* commit '
792fce7804f18ef5b9f37ee857925f800abf1b50':
Rich Sloager [Thu, 27 Aug 2015 20:00:32 +0000 (20:00 +0000)]
am
d9a17371: am
ece6e5f7: (-s ours) am
0ac81a6e: am
fd8da61a: am
f0cd0441: Merge "docs: studio 1.3 manifest merger update" into mnc-preview-docs
* commit '
d9a1737131166abab0eb8e0936022560e2585ce0':
Rich Sloager [Thu, 27 Aug 2015 20:00:23 +0000 (20:00 +0000)]
am
6c9dd1e7: am
4803a668: (-s ours) am
3cff3688: am
371ccd13: am
51c02f6a: Merge "docs: studio 1.3 revisions - android plugin for gradle" into mnc-preview-docs
* commit '
6c9dd1e70854bb6f74802b7a955b929f6012ac3d':
Rich Sloager [Thu, 27 Aug 2015 20:00:11 +0000 (20:00 +0000)]
am
248f3d36: am
77a70b12: (-s ours) am
110a5574: am
f82f33d3: am
4c5b6cc4: Merge "docs: studio 1.3 live templates" into mnc-preview-docs
* commit '
248f3d368b27d9af25cb8d69623dbeead1cb1723':