OSDN Git Service
Craig Mautner [Thu, 8 Jan 2015 19:20:57 +0000 (19:20 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev automerge:
62a32ee
automerge:
125b725
* commit '
125b725f46199b7058e437bb83f5d5179e1be73e':
Remove AppWindowTokens from exiting apps with task
Sanket Padawe [Thu, 8 Jan 2015 19:16:29 +0000 (19:16 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev automerge:
d3b6956
automerge:
720b3a0
* commit '
720b3a04a499d1ed516a37a8eadade9c8fb15f51':
Removing DUN APN for Koodo CA (302-220)
Craig Mautner [Thu, 8 Jan 2015 19:13:38 +0000 (19:13 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev
automerge:
62a32ee
* commit '
62a32ee1dfff6921fd95c92068500af6b8b3f47e':
Remove AppWindowTokens from exiting apps with task
Sanket Padawe [Thu, 8 Jan 2015 19:12:28 +0000 (19:12 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev
automerge:
d3b6956
* commit '
d3b69567e3b6891574b8f06e3fc88ba91d4f7436':
Removing DUN APN for Koodo CA (302-220)
Craig Mautner [Thu, 8 Jan 2015 19:09:40 +0000 (19:09 +0000)]
Merge "Remove AppWindowTokens from exiting apps with task" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 19:08:08 +0000 (19:08 +0000)]
Merge "Removing DUN APN for Koodo CA (302-220)" into lmp-mr1-dev
Sanket Padawe [Thu, 8 Jan 2015 19:05:43 +0000 (11:05 -0800)]
Removing DUN APN for Koodo CA (302-220)
Bug:
18813997
Change-Id: I7d129dfa0015d8a1d01e749dafcb7d95f837a5ec
Craig Mautner [Thu, 8 Jan 2015 18:56:00 +0000 (10:56 -0800)]
Remove AppWindowTokens from exiting apps with task
When the task is removed from a task stack in window manager any
exiting activities left in the stack were orphaned. This led to a
memory leak. Removing all task activities from those that are exiting
fixes this problem.
Fixes bug
18943737.
Change-Id: I0a5ea8d2d3be89af7ccaf01385a226a2eafdf507
Christoph Studer [Thu, 8 Jan 2015 18:51:48 +0000 (18:51 +0000)]
am
9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
automerge:
bbadf11
* commit '
bbadf1161aacafd80182dda080534a123a7204ef':
NoMan: Cancel previous instance of ignored notification
Christoph Studer [Thu, 8 Jan 2015 18:49:53 +0000 (18:49 +0000)]
am
9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
* commit '
9d4b7963399045395799dcb7df5d8c84d9b12884':
NoMan: Cancel previous instance of ignored notification
Christoph Studer [Thu, 8 Jan 2015 18:44:21 +0000 (18:44 +0000)]
Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev
Craig Mautner [Thu, 8 Jan 2015 18:37:43 +0000 (18:37 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev automerge:
28a4cea -s ours
automerge:
7cd49c6 -s ours
* commit '
7cd49c6c3a2678510a278f28514c73dcbaae8957':
Fix pointer index out of range exception DO NOT MERGE
Craig Mautner [Thu, 8 Jan 2015 18:35:32 +0000 (18:35 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
automerge:
28a4cea -s ours
* commit '
28a4cea5a0f8d0e33b9d6a3283d31cc1e976c74c':
Fix pointer index out of range exception DO NOT MERGE
Craig Mautner [Thu, 8 Jan 2015 18:34:00 +0000 (18:34 +0000)]
Merge "Fix pointer index out of range exception DO NOT MERGE" into lmp-mr1-dev
Dianne Hackborn [Thu, 8 Jan 2015 18:17:33 +0000 (18:17 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev automerge:
a7881fd
automerge:
30ae442
* commit '
30ae442133c55d4aa3636127de556736b2eaa99f':
Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
Dianne Hackborn [Thu, 8 Jan 2015 18:11:31 +0000 (18:11 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev
automerge:
a7881fd
* commit '
a7881fd30b973f923c98d53bddf397d744b4229c':
Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs.
Dianne Hackborn [Thu, 8 Jan 2015 18:08:12 +0000 (18:08 +0000)]
Merge "Add new debug feature to track associations between processes. Also add some debugging for spurious service ANRs." into lmp-mr1-dev
Andres Morales [Thu, 8 Jan 2015 16:15:47 +0000 (16:15 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev automerge:
d656955
automerge:
c9a7694
* commit '
c9a76941ecca457e6a17b06f557c24e18e3bdafa':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:13:17 +0000 (16:13 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
automerge:
d656955
* commit '
d656955efdd2e148d9390125b899e8fe2b677abd':
Wipe FRP partition if OEM unlock enabled
Andres Morales [Thu, 8 Jan 2015 16:10:25 +0000 (16:10 +0000)]
Merge "Wipe FRP partition if OEM unlock enabled" into lmp-mr1-dev
tingna_sung [Sat, 25 Oct 2014 13:52:47 +0000 (21:52 +0800)]
Fix pointer index out of range exception DO NOT MERGE
Avoid pointer index out of range error if return value is -1 of
findPointerIndex() when there is no data available for that pointer
identifier.
Change-Id: I2a08f04c678164e220852094baa124ba157e2e42
Signed-off-by: tingna_sung <tingna_sung@htc.com>
Fixes bug
18883936
Vladimir Marko [Thu, 8 Jan 2015 10:46:53 +0000 (10:46 +0000)]
resolved conflicts for merge of
36401a36 to lmp-mr1-dev-plus-aosp
Change-Id: Ic280478a5979a47cac148c0eac9bdfd20ec0e6e7
Vladimir Marko [Thu, 8 Jan 2015 10:28:27 +0000 (10:28 +0000)]
am
e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." into lmp-mr1-dev
* commit '
e9a935f6b60f5abaf9cdbd45f18d2e8c0a9c6bd8':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Thu, 8 Jan 2015 10:24:48 +0000 (10:24 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev
Bryce Lee [Thu, 8 Jan 2015 04:38:01 +0000 (04:38 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev automerge:
c010c96
automerge:
d1646dc
* commit '
d1646dcfd1d40bdc094f34e05c1359cfc3fa7c65':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:32:40 +0000 (04:32 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
automerge:
c010c96
* commit '
c010c96fdf143b242c9795a71b231ccb4658b625':
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
Bryce Lee [Thu, 8 Jan 2015 04:30:12 +0000 (04:30 +0000)]
Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."" into lmp-mr1-dev
Jinsuk Kim [Thu, 8 Jan 2015 04:18:01 +0000 (04:18 +0000)]
am
62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev automerge:
09d4e03
* commit '
62a1e753b1f73f575c978a377efdc531e7a86b8f':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:11:47 +0000 (04:11 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
automerge:
09d4e03
* commit '
09d4e03736caa1baf07256fc5cd6d61b264021a7':
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Jinsuk Kim [Thu, 8 Jan 2015 04:08:52 +0000 (04:08 +0000)]
Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput" into lmp-mr1-dev
Jinsuk Kim [Wed, 7 Jan 2015 07:45:14 +0000 (16:45 +0900)]
CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput
Resolves a timing-related bug that fails to process the command
<Active Source> at TV boot up. Checks if TV input required for
the command is ready to accept the request. If not, makes sure
the command is buffered, and processed later when the input is
ready.
Bug:
18896770
Change-Id: Id17e5e8468519b17daf61c962dd718ccc56fb0ea
Bryce Lee [Thu, 8 Jan 2015 02:32:08 +0000 (02:32 +0000)]
Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."
This reverts commit
fabbdf7204474a9f789ce441219b3b9f3df66bb8.
Causes NPE on devices without telephony (Android Wear for example)
Bug:
18922524
Change-Id: I3be4187a20da11fd5a302dd88e808a68cd7e5737
Deepanshu Gupta [Thu, 8 Jan 2015 01:49:23 +0000 (01:49 +0000)]
am
2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
automerge:
03c822a
* commit '
03c822aa585c319fb9cd05f392d8518501cc4f79':
Replace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 01:47:52 +0000 (01:47 +0000)]
am
169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev
automerge:
33b2de7
* commit '
33b2de7f34180983fe596ff9faa6955b032fa157':
Add missing DateFormat method.
Deepanshu Gupta [Thu, 8 Jan 2015 01:46:46 +0000 (01:46 +0000)]
am
565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev
automerge:
7e39385
* commit '
7e393853656387757da2531d4e504d7cf32e738e':
Update platform.dir search in tests.
Deepanshu Gupta [Thu, 8 Jan 2015 01:38:44 +0000 (01:38 +0000)]
am
2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
* commit '
2d14feb4c7185008111f3a6340f114a4c891e01c':
Replace java.util.LinkedHashMap.eldest()
Deepanshu Gupta [Thu, 8 Jan 2015 01:31:54 +0000 (01:31 +0000)]
Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:23:35 +0000 (01:23 +0000)]
am
169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev
* commit '
169c11dd39ec44364168785a7a83fb747e893c9a':
Add missing DateFormat method.
Deepanshu Gupta [Thu, 8 Jan 2015 01:23:30 +0000 (01:23 +0000)]
am
565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev
* commit '
565b6b415a18ee0b99af8cb693b980e57136282b':
Update platform.dir search in tests.
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:31 +0000 (01:17 +0000)]
Merge "Add missing DateFormat method." into lmp-mr1-dev
Deepanshu Gupta [Thu, 8 Jan 2015 01:17:22 +0000 (01:17 +0000)]
Merge "Update platform.dir search in tests." into lmp-mr1-dev
Jeff Sharkey [Thu, 8 Jan 2015 01:03:49 +0000 (01:03 +0000)]
Merge "check ntpserver as empty string instead of null" automerge:
dbcb4a1
automerge:
387da77
* commit '
387da7769757ab6368acb2a0000cd8a85d3e55d8':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 00:59:56 +0000 (00:59 +0000)]
Merge "check ntpserver as empty string instead of null"
automerge:
dbcb4a1
* commit '
dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 00:57:42 +0000 (00:57 +0000)]
Merge "check ntpserver as empty string instead of null"
Young-Ho Cha [Wed, 7 Jan 2015 02:24:35 +0000 (11:24 +0900)]
check ntpserver as empty string instead of null
mServer cannot set null, because string from resource always returns
non-null charsequence
Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Deepanshu Gupta [Thu, 8 Jan 2015 00:25:59 +0000 (16:25 -0800)]
Replace java.util.LinkedHashMap.eldest()
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.
Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
Deepanshu Gupta [Thu, 8 Jan 2015 00:03:58 +0000 (00:03 +0000)]
am
a98a9b30: am
d8e99c58: am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge:
0b1188e
* commit '
a98a9b30bea74478b9d1b3f16e3713f5c864e648':
Fix tests on jenkins, take 2.
Joe Fernandez [Thu, 8 Jan 2015 00:03:52 +0000 (00:03 +0000)]
am
ec5f5934: am
97b7b863: am
d385640f: am
491a8257: docs: Update Dashboard for January 2015 automerge:
0e13957
* commit '
ec5f5934153557e85c1a001e713b963b79d18388':
docs: Update Dashboard for January 2015
Deepanshu Gupta [Wed, 7 Jan 2015 23:57:59 +0000 (23:57 +0000)]
am
d8e99c58: am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge:
0b1188e
* commit '
d8e99c5861b09de8f709c9284240e2c3115507bb':
Fix tests on jenkins, take 2.
Joe Fernandez [Wed, 7 Jan 2015 23:57:54 +0000 (23:57 +0000)]
am
97b7b863: am
d385640f: am
491a8257: docs: Update Dashboard for January 2015 automerge:
0e13957
* commit '
97b7b8637bc50cbcd9ad9a63fcb34355439b0701':
docs: Update Dashboard for January 2015
Deepanshu Gupta [Wed, 7 Jan 2015 23:53:09 +0000 (23:53 +0000)]
am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
automerge:
0b1188e
* commit '
0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
Fix tests on jenkins, take 2.
Joe Fernandez [Wed, 7 Jan 2015 23:51:33 +0000 (23:51 +0000)]
am
d385640f: am
491a8257: docs: Update Dashboard for January 2015
automerge:
0e13957
* commit '
0e13957a4deab3a90492d9ae2f6d35d3b5c1773e':
docs: Update Dashboard for January 2015
Christopher Tate [Wed, 7 Jan 2015 23:30:34 +0000 (23:30 +0000)]
am
413ec4a6: am
bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '
413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
Support single-package backup rejection by the transport
Christopher Tate [Wed, 7 Jan 2015 23:23:14 +0000 (23:23 +0000)]
am
bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '
bee49807dde9f19d5163e87b71fe17392bfe857c':
Support single-package backup rejection by the transport
Christopher Tate [Wed, 7 Jan 2015 23:19:49 +0000 (23:19 +0000)]
Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
Andres Morales [Wed, 7 Jan 2015 22:24:57 +0000 (14:24 -0800)]
Wipe FRP partition if OEM unlock enabled
Not all devices invoke recovery on every userdata wipe,
so we can't rely on code in the
recovery OS to do this. This results in fastboot -w
not properly wiping the FRP partition. This patch
fixes the issue by having the framework level service
check the OEM unlock enabled bit, and wiping the partition
if it is set.
Bug:
18644051
Change-Id: Id97a29916fe39561700912a920c5741109842bdb
Andreas Gampe [Wed, 7 Jan 2015 22:16:11 +0000 (22:16 +0000)]
am
ec64c0b6: am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '
ec64c0b6e639b743398fb543218100fdaf9a7f69':
Core/jni: Disallow relocation for decryption
Andreas Gampe [Wed, 7 Jan 2015 22:09:11 +0000 (22:09 +0000)]
am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '
022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
Core/jni: Disallow relocation for decryption
RoboErik [Wed, 7 Jan 2015 22:06:47 +0000 (22:06 +0000)]
am
13d1057d: am
2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
* commit '
13d1057d5b3ca46d00d627a89f0d37836b9db8fd':
Don't unmute when trying to show volume UI. DO NOT MERGE
Andreas Gampe [Wed, 7 Jan 2015 22:05:11 +0000 (22:05 +0000)]
Merge "Core/jni: Disallow relocation for decryption"
Dianne Hackborn [Wed, 7 Jan 2015 21:43:13 +0000 (13:43 -0800)]
Add new debug feature to track associations between processes. Also
add some debugging for spurious service ANRs.
Bug:
18201239
Change-Id: Icd43f35c696d71453e1d4deea855984b2d14b347
RoboErik [Wed, 7 Jan 2015 22:00:28 +0000 (22:00 +0000)]
am
2610d712: Don\'t unmute when trying to show volume UI. DO NOT MERGE
* commit '
2610d71251e3e376e2514f20986c81e5d55f1b55':
Don't unmute when trying to show volume UI. DO NOT MERGE
neo.chae [Wed, 7 Jan 2015 06:32:15 +0000 (15:32 +0900)]
Core/jni: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.
If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.
This patch ensures that the boot image is not being relocated.
Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
Deepanshu Gupta [Wed, 7 Jan 2015 20:26:31 +0000 (12:26 -0800)]
Add missing DateFormat method.
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
Deepanshu Gupta [Wed, 7 Jan 2015 20:21:59 +0000 (12:21 -0800)]
Update platform.dir search in tests.
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.
Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
RoboErik [Wed, 7 Jan 2015 19:10:23 +0000 (11:10 -0800)]
Don't unmute when trying to show volume UI. DO NOT MERGE
When a MediaSession is active the adjust volume event to show UI was
causing the stream to be unmuted. Since this happens after every mute
event you were unable to mute while a session was active. This change
doesn't unmute for events that just show the UI.
bug:
18844550
Change-Id: Ic8b0f1ab1354646724ead4572a973c302c275eab
Deepanshu Gupta [Wed, 7 Jan 2015 19:46:03 +0000 (19:46 +0000)]
am
3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '
3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
Fix tests on jenkins, take 2.
Deepanshu Gupta [Wed, 7 Jan 2015 19:29:39 +0000 (19:29 +0000)]
Merge "Fix tests on jenkins, take 2." into lmp-dev
Deepanshu Gupta [Wed, 7 Jan 2015 19:22:22 +0000 (11:22 -0800)]
Fix tests on jenkins, take 2.
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
Narayan Kamath [Wed, 7 Jan 2015 18:42:57 +0000 (18:42 +0000)]
am
e02fe5af: am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit '
e02fe5afac0bc792559a4c424ffc8391c501abfe':
camera2: Clarify the documentation on the ImageReader usecase
Narayan Kamath [Wed, 7 Jan 2015 18:36:05 +0000 (18:36 +0000)]
am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit '
c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
camera2: Clarify the documentation on the ImageReader usecase
Narayan Kamath [Wed, 7 Jan 2015 18:31:55 +0000 (18:31 +0000)]
Merge "camera2: Clarify the documentation on the ImageReader usecase"
Wale Ogunwale [Wed, 7 Jan 2015 18:14:39 +0000 (18:14 +0000)]
am
6763058f: am
f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
* commit '
6763058fe74c31bd44b8c94e2911c72e9db68e97':
Bring task with root activity to front when launching from recents.
Martin Storsjo [Wed, 19 Nov 2014 09:58:03 +0000 (11:58 +0200)]
camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.
Change-Id: I75261baf162a58c415705db99afa474c3826f900
Wale Ogunwale [Wed, 7 Jan 2015 18:08:55 +0000 (18:08 +0000)]
am
f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
* commit '
f61bc8a2624bc70c903238229a62abc3351ed620':
Bring task with root activity to front when launching from recents.
Wale Ogunwale [Wed, 7 Jan 2015 18:02:40 +0000 (18:02 +0000)]
Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 17:07:26 +0000 (17:07 +0000)]
am
56db8228: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
56db82282d701c81cedb38b246716e406c2158ff':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 17:02:34 +0000 (17:02 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 7 Jan 2015 16:58:27 +0000 (08:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: I91b076501cd9499fcd60f899fe7299735bf8c140
Auto-generated-cl: translation import
Ben Murdoch [Wed, 7 Jan 2015 16:01:27 +0000 (16:01 +0000)]
am
d4bc9577: am
1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
* commit '
d4bc95770ddfcb8be63fa768ac9eaf27512f8107':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Ben Murdoch [Wed, 7 Jan 2015 15:55:12 +0000 (15:55 +0000)]
am
1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
* commit '
1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf':
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Ben Murdoch [Wed, 7 Jan 2015 15:50:50 +0000 (15:50 +0000)]
Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 15:37:27 +0000 (15:37 +0000)]
am
d79d0310: (-s ours) am
585a210d: (-s ours) Import translations. DO NOT MERGE
* commit '
d79d0310b1eb6e250b3009653ac0490f35fd95bd':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 15:32:10 +0000 (15:32 +0000)]
am
585a210d: (-s ours) Import translations. DO NOT MERGE
* commit '
585a210ddb09d41c5ee4347e991c4fc51e2dbebe':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 15:24:21 +0000 (07:24 -0800)]
Import translations. DO NOT MERGE
Change-Id: I41b418841fd7a2c436257ec29312411b1277b867
Auto-generated-cl: translation import
Ben Murdoch [Wed, 7 Jan 2015 14:20:45 +0000 (14:20 +0000)]
Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Bug:
18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
Robin Lee [Wed, 7 Jan 2015 12:41:44 +0000 (12:41 +0000)]
am
26e2da8f: am
374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
* commit '
26e2da8ff8bdd577c915620c93805f21ff1fd65e':
Profile owner hint in warning for extra CAs
Robin Lee [Wed, 7 Jan 2015 12:36:11 +0000 (12:36 +0000)]
am
374c358d: Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
* commit '
374c358dd201583771b7aa391c56618548f543a6':
Profile owner hint in warning for extra CAs
Robin Lee [Wed, 7 Jan 2015 12:30:54 +0000 (12:30 +0000)]
Merge "Profile owner hint in warning for extra CAs" into lmp-mr1-dev
Vladimir Marko [Tue, 6 Jan 2015 18:17:52 +0000 (18:17 +0000)]
Check for OOM in BitmapFactory's getMimeTypeString().
Bug:
18909596
(cherry picked from commit
7ab249a18e08bfefb8c2d60af1fb668c67ba4368)
Change-Id: Ie7be228442876d47faf37e3f664e378253dab6e3
Vladimir Marko [Wed, 7 Jan 2015 10:30:44 +0000 (10:30 +0000)]
am
bf31cb6b: am
8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '
bf31cb6be4290ce161d99a2a70c318f665a14a77':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Wed, 7 Jan 2015 10:24:43 +0000 (10:24 +0000)]
am
8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '
8371f2e3fac04663dae2e5fb98dbce7e32325991':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Wed, 7 Jan 2015 10:20:48 +0000 (10:20 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()."
Deepanshu Gupta [Wed, 7 Jan 2015 10:17:51 +0000 (10:17 +0000)]
am
fa490b78: am
984823f5: am
7f9582ce: am
48603a39: Fix tests on jenkins
* commit '
fa490b78df732f484475e214eec033f89c5b40b7':
Fix tests on jenkins
Quddus Chong [Wed, 7 Jan 2015 10:17:45 +0000 (10:17 +0000)]
am
dc1db5bf: am
bc8b0541: am
96f11258: am
dc649c8d: am
8a195822: Merge "docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727" into lmp-docs
* commit '
dc1db5bf5413bc432c77910d11c15b0442b27ace':
docs: Added explicit filepath for Android Media Browser and Android Messaging simulators. bug:
18759727
Quddus Chong [Wed, 7 Jan 2015 10:17:39 +0000 (10:17 +0000)]
am
0178c0d7: am
7628b728: am
decac431: am
14694d6e: am
3bdc68ed: Merge "docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181" into lmp-docs
* commit '
0178c0d782fb19cc6235ef6722251a441734345e':
docs: Updated GMS version numbering to be consistent with blog post. bug:
18718181
Quddus Chong [Wed, 7 Jan 2015 10:17:33 +0000 (10:17 +0000)]
am
1f03d4ba: am
fbb27960: am
4d39cfa4: am
a63d2b83: am
b55e2bf0: Merge "docs: Updated the description of the enhanced camera APIs in L. bug:
18142680" into lmp-docs
* commit '
1f03d4ba753c9c75a430703e535f4c0cd9daef67':
docs: Updated the description of the enhanced camera APIs in L. bug:
18142680
Joe Fernandez [Wed, 7 Jan 2015 10:17:26 +0000 (10:17 +0000)]
am
912b2574: am
52aec00c: am
ca14e6c8: am
f50be1fc: am
91c35ce1: Merge "docs: studio index typo" into lmp-docs
* commit '
912b25743d241caa150fd56aa15d1a6b9c59e428':
docs: studio index typo
Joe Fernandez [Wed, 7 Jan 2015 10:17:20 +0000 (10:17 +0000)]
am
ea765e7d: am
76094382: am
c6fe54ed: am
62c3abe7: am
acb35e19: Merge "docs: studio bundle checksum update" into lmp-docs
* commit '
ea765e7d803bd85c81c87611f76c4f176045c0f1':
docs: studio bundle checksum update
Joe Fernandez [Wed, 7 Jan 2015 10:17:13 +0000 (10:17 +0000)]
am
909f840c: am
4c5b5cff: Merge "resolved conflicts for merge of
ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
* commit '
909f840cdaf4f172b29c2c56921c4619165c4820':
docs: Checklist for TV Apps