OSDN Git Service
Tor Norbye [Mon, 16 Mar 2015 23:03:39 +0000 (23:03 +0000)]
Merge "Add @TransitionRes for transition resource integers"
Jeff Brown [Mon, 16 Mar 2015 22:53:21 +0000 (22:53 +0000)]
Merge "Reduce SQLite logspam."
Jeff Brown [Mon, 16 Mar 2015 22:21:45 +0000 (15:21 -0700)]
Reduce SQLite logspam.
Suppress "automatic index on" warnings unless verbose logging is enabled.
Also suppress any notices.
Bug:
19773765
Change-Id: I4a4160e81e2cccf5119770182a64d6bbd9cc3505
Selim Cinek [Mon, 16 Mar 2015 22:29:23 +0000 (22:29 +0000)]
Merge "Fixed a bug where HUNs would not dissappear"
Adam Lesinski [Mon, 16 Mar 2015 22:16:03 +0000 (22:16 +0000)]
Merge "Only attempt to load .apk files in AssetManager"
Adam Lesinski [Mon, 16 Mar 2015 22:10:56 +0000 (15:10 -0700)]
Only attempt to load .apk files in AssetManager
This will reduce the number of files we must open
and reduce log spam.
Change-Id: I595ba4a5ea8466e530915d6ae4cf1d3e3dba15ef
Dianne Hackborn [Mon, 16 Mar 2015 22:01:49 +0000 (22:01 +0000)]
Merge "Add new voice request for picking from a list."
Andreas Gampe [Mon, 16 Mar 2015 21:58:39 +0000 (21:58 +0000)]
am
7f95a1bc: am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
7f95a1bc3271318d7f08f19426be24b17186f9f0':
Frameworks/base: Force long computation
Tor Norbye [Mon, 16 Mar 2015 21:20:30 +0000 (21:20 +0000)]
Merge "Add resource type annotations to some APIs"
Andreas Gampe [Mon, 16 Mar 2015 20:49:12 +0000 (20:49 +0000)]
am
5eb42122: Merge "Frameworks/base: Force long computation"
* commit '
5eb421221bcade4f5715d42843346f7d3c733547':
Frameworks/base: Force long computation
Andreas Gampe [Mon, 16 Mar 2015 20:36:04 +0000 (20:36 +0000)]
Merge "Frameworks/base: Force long computation"
Selim Cinek [Mon, 16 Mar 2015 20:34:43 +0000 (13:34 -0700)]
Fixed a bug where HUNs would not dissappear
Bug:
19626170
Change-Id: Iadc4bd6b2bfc85b3da67e1e87cf1514cfcb269bb
Andreas Gampe [Mon, 16 Mar 2015 20:26:43 +0000 (20:26 +0000)]
am
e6857531: am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
e685753136ee8e88212ad95b24284a153c86a0c1':
Frameworks/base: Check before foreach in Script
Andreas Gampe [Mon, 16 Mar 2015 20:26:32 +0000 (20:26 +0000)]
am
c3228a9d: am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
c3228a9d400bcacd15fbbdf136ee1f9cf56de2d0':
Frameworks/base: Use equals for Integer comparison
Derek Sollenberger [Mon, 16 Mar 2015 19:40:07 +0000 (19:40 +0000)]
Merge "Add conic support to HWUI path tessellator."
Andreas Gampe [Mon, 16 Mar 2015 19:31:17 +0000 (19:31 +0000)]
am
f3e581c9: Merge "Frameworks/base: Check before foreach in Script"
* commit '
f3e581c99f33ae1857fa52b11cf9bfbfe400c553':
Frameworks/base: Check before foreach in Script
Derek Sollenberger [Mon, 16 Mar 2015 18:35:55 +0000 (14:35 -0400)]
Add conic support to HWUI path tessellator.
bug:
19732872
Change-Id: Ic3ae46f746325468ab972c9daf829099165eb596
Andreas Gampe [Mon, 16 Mar 2015 19:22:00 +0000 (19:22 +0000)]
am
3d33314e: Merge "Frameworks/base: Use equals for Integer comparison"
* commit '
3d33314e03c24758e3b3bbd9e23e40199a259b80':
Frameworks/base: Use equals for Integer comparison
Andreas Gampe [Mon, 16 Mar 2015 19:17:44 +0000 (19:17 +0000)]
Merge "Frameworks/base: Check before foreach in Script"
Andreas Gampe [Mon, 16 Mar 2015 19:10:39 +0000 (19:10 +0000)]
Merge "Frameworks/base: Use equals for Integer comparison"
Eric Laurent [Mon, 16 Mar 2015 18:30:21 +0000 (18:30 +0000)]
Merge "broadcast radio API"
Eric Laurent [Mon, 16 Mar 2015 18:29:19 +0000 (18:29 +0000)]
Merge "broadcast radio JNI."
Dianne Hackborn [Sat, 14 Mar 2015 01:02:54 +0000 (18:02 -0700)]
Add new voice request for picking from a list.
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).
And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.
Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
Andreas Gampe [Mon, 16 Mar 2015 18:11:47 +0000 (18:11 +0000)]
am
8af305f1: am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
8af305f17ff0d4b84e5a71777de788e9a6ae2780':
Revert "Frameworks/base: Fix a constructor"
Andreas Gampe [Mon, 16 Mar 2015 18:03:17 +0000 (18:03 +0000)]
am
6878ee57: Merge "Revert "Frameworks/base: Fix a constructor""
* commit '
6878ee57b438b063fcc09a19a04fba92e113c1d2':
Revert "Frameworks/base: Fix a constructor"
Selim Cinek [Mon, 16 Mar 2015 18:00:59 +0000 (18:00 +0000)]
Merge "Added more anti-falsing logic"
Selim Cinek [Thu, 27 Nov 2014 13:06:04 +0000 (14:06 +0100)]
Added more anti-falsing logic
We now discard unlock attempts with multiple pointers.
Bug:
18544191
Change-Id: Id2e7bca0353b3f85aa193f6a5c793b93ca0776e3
Andreas Gampe [Mon, 16 Mar 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Revert "Frameworks/base: Fix a constructor""
Andreas Gampe [Mon, 16 Mar 2015 17:51:01 +0000 (17:51 +0000)]
Revert "Frameworks/base: Fix a constructor"
The constructor was public API, doh. Gotta do this differently.
This reverts commit
33c5b2a62f3e62382c41e24c6b527119978816a0.
Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
Andreas Gampe [Mon, 16 Mar 2015 17:20:12 +0000 (17:20 +0000)]
am
8e176d39: am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
8e176d396d393af90ffe288d849e95ff40aa2b23':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:13:26 +0000 (17:13 +0000)]
am
19279ec0: am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
19279ec04845b2a47b90240c9d47bf8fb5ece464':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 17:12:57 +0000 (17:12 +0000)]
am
007e207b: Merge "Frameworks/base: Fix null-pointer check"
* commit '
007e207bdeda3f0143eba8f52db3e72bf7487efb':
Frameworks/base: Fix null-pointer check
Andreas Gampe [Mon, 16 Mar 2015 17:03:02 +0000 (17:03 +0000)]
am
d61cbf9a: Merge "Frameworks/base: Fix a constructor"
* commit '
d61cbf9a08733b45a6aecafffffa60da269a3e1e':
Frameworks/base: Fix a constructor
Andreas Gampe [Mon, 16 Mar 2015 16:59:13 +0000 (16:59 +0000)]
Merge "Frameworks/base: Fix null-pointer check"
Andreas Gampe [Mon, 16 Mar 2015 16:51:00 +0000 (16:51 +0000)]
Merge "Frameworks/base: Fix a constructor"
Robert Greenwalt [Mon, 16 Mar 2015 16:48:46 +0000 (16:48 +0000)]
am
7cff91ea: am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
7cff91ea67f89ca963a822daa1b68674bfc0e587':
Frameworks/base: Fix a hashCode implementation
Andreas Gampe [Mon, 16 Mar 2015 16:45:34 +0000 (09:45 -0700)]
resolved conflicts for merge of
038b8462 to master
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
Ronghua Wu [Mon, 16 Mar 2015 16:38:24 +0000 (16:38 +0000)]
Merge "media: add MediaFormat.KEY_PRIORITY."
Robert Greenwalt [Mon, 16 Mar 2015 16:29:52 +0000 (16:29 +0000)]
am
079cfa64: Merge "Frameworks/base: Fix a hashCode implementation"
* commit '
079cfa64ec827e80d3173e2043218866f1b36146':
Frameworks/base: Fix a hashCode implementation
Robert Greenwalt [Mon, 16 Mar 2015 16:17:50 +0000 (16:17 +0000)]
Merge "Frameworks/base: Fix a hashCode implementation"
Andreas Gampe [Mon, 16 Mar 2015 15:43:37 +0000 (15:43 +0000)]
am
5abcd06b: Merge "Frameworks/base: Fix always-false equals"
* commit '
5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
Frameworks/base: Fix always-false equals
Mike Reed [Mon, 16 Mar 2015 15:36:42 +0000 (15:36 +0000)]
Merge "use SkFilterQuality instead of SkPaint::FilterLevel"
Mike Reed [Mon, 16 Mar 2015 15:16:09 +0000 (11:16 -0400)]
use SkFilterQuality instead of SkPaint::FilterLevel
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
Geoff Mendal [Mon, 16 Mar 2015 15:29:50 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Andreas Gampe [Mon, 16 Mar 2015 15:28:52 +0000 (15:28 +0000)]
Merge "Frameworks/base: Fix always-false equals"
John Reck [Mon, 16 Mar 2015 15:16:17 +0000 (15:16 +0000)]
am
059ba981: am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
059ba9814bb07aeebd8bf697fc05ff833c63033b':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 15:09:04 +0000 (15:09 +0000)]
am
386dcbdd: Merge "Frameworks/base: Fix missing cast"
* commit '
386dcbddf5c166f98209b78389e79d49ab3a8222':
Frameworks/base: Fix missing cast
John Reck [Mon, 16 Mar 2015 14:56:51 +0000 (14:56 +0000)]
Merge "Frameworks/base: Fix missing cast"
Geoff Mendal [Mon, 16 Mar 2015 14:43:37 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib0dfcbb5ffa71a512164af5435a0784279bde292
Auto-generated-cl: translation import
Robin Lee [Mon, 16 Mar 2015 14:32:08 +0000 (14:32 +0000)]
Merge "Recognise insecure encryption with a new constant"
Geoff Mendal [Mon, 16 Mar 2015 14:01:59 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:48:54 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:37:26 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5974745b1b216beda4ebed9da78b0b2c0b4d4efe
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:25:49 +0000 (06:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:22:28 +0000 (13:22 +0000)]
am
c64f5ca0: (-s ours) am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
c64f5ca02b16ebece40c21f401f75c7ace8178ac':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:22:20 +0000 (13:22 +0000)]
am
4777b612: (-s ours) am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
4777b612e07f57afbcf362b78b0b6e1e5e77e8bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:20:49 +0000 (13:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:19:39 +0000 (06:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 13:14:52 +0000 (13:14 +0000)]
am
0134869b: (-s ours) am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:14:47 +0000 (13:14 +0000)]
am
3437d9e7: (-s ours) am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
3437d9e716e477d407dfc13cc797500e6421e464':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:10:08 +0000 (13:10 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:08:42 +0000 (13:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 16 Mar 2015 13:07:29 +0000 (13:07 +0000)]
am
74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
74c66d10a7b2237f8aaf8c10675a10b9347860f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:07:26 +0000 (13:07 +0000)]
am
57d39a3d: (-s ours) Import translations. DO NOT MERGE
* commit '
57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:05:42 +0000 (13:05 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 16 Mar 2015 13:04:07 +0000 (13:04 +0000)]
am
3fb3408b: (-s ours) am
eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:03:56 +0000 (13:03 +0000)]
am
e0c0f6c2: (-s ours) am
9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 13:03:55 +0000 (06:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic3f3b8418d69d37a26c0be77047faf3ea9294b0f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:57:47 +0000 (05:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5059160456eb65bedb552f97b6ed500ef540839f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:57:17 +0000 (12:57 +0000)]
am
eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
eb1aec7fef3597fbbffe157a803e1dd54a9054b5':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:57:12 +0000 (12:57 +0000)]
am
9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '
9a036229277479c0bc53d850ed5c98b8b69aa080':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:56:32 +0000 (12:56 +0000)]
am
51448a1a: (-s ours) am
e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit '
51448a1a604ca7e4c8cedeb31d2907bcca524f6e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:52:00 +0000 (05:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I17a68a6a20954432a352e132ac02cb0c9597e1d3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:50:19 +0000 (12:50 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:39 +0000 (12:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
Geoff Mendal [Mon, 16 Mar 2015 12:49:25 +0000 (12:49 +0000)]
am
e35b3e38: (-s ours) Import translations. DO NOT MERGE
* commit '
e35b3e380f42f450ce0116b8ef83edb7d68584ef':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Mar 2015 12:48:31 +0000 (05:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icc111cdfe84d93d8212be18ba9815a50a83f059c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:33 +0000 (05:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ecfa92145f12da6a6101a84c9fd10db911948a1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:35:06 +0000 (07:35 -0500)]
Import translations. DO NOT MERGE
Change-Id: I50b5dec066f0ded04d173b768fe2285f9eebf81d
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Mar 2015 12:31:48 +0000 (05:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9f312c6b5a86264eb96437751fefd5957383b400
Auto-generated-cl: translation import
Nicolas Prevot [Mon, 16 Mar 2015 11:25:50 +0000 (11:25 +0000)]
Merge "Remove the owner userid of cross-profile intent filters."
Andreas Gampe [Mon, 16 Mar 2015 03:17:07 +0000 (20:17 -0700)]
Frameworks/base: Force long computation
Ensure that an int-based computation is carried out as long.
Change-Id: I23b10a95600674e8a5a65c0ea349afdc6aa152ae
Andreas Gampe [Sun, 15 Mar 2015 22:57:30 +0000 (15:57 -0700)]
Frameworks/base: Check before foreach in Script
According to the if below, ains == null is potentially valid. But
the foreach loop would throw a NullPointerException.
Change-Id: I4460fb1357eaa3abfe0ab9a21effb608f474ab51
Andreas Gampe [Sun, 15 Mar 2015 22:39:21 +0000 (15:39 -0700)]
Frameworks/base: Use equals for Integer comparison
Integer == is dangerous, as equal objects may not be identical
objects. In fact, MediaFormat.setInteger was creating a new object
every time.
Change MediaFormat.setInteger and setLong to use valueOf, which
may reuse returned objects.
Change-Id: Iedcc6003adbf05c0c870aa4b3ada7f181a5b870e
Andreas Gampe [Sun, 15 Mar 2015 22:07:19 +0000 (15:07 -0700)]
Frameworks/base: Fix null-pointer check
Change-Id: I715a21c313e909ae654e0c1aa67bdf7bcd89de76
Andreas Gampe [Sun, 15 Mar 2015 21:38:59 +0000 (14:38 -0700)]
Frameworks/base: Fix a hashCode implementation
Equals uses Arrays.equals. That means two responses are equal if
the content of the data arrays is equal. By convention, the hash
code of those objects should agree. In that case one cannot use
hashCode on the array (which is the identity hash code).
Change-Id: Icce8e2e71e9142421f5dac8a0ee8a211623fb704
Andreas Gampe [Sun, 15 Mar 2015 21:29:16 +0000 (14:29 -0700)]
Frameworks/base: Fix a constructor
This was meant to be a constructor, according to the comment.
Change-Id: Ief49011b392e58b37d9acb4a3f754f1828b256af
Andreas Gampe [Sun, 15 Mar 2015 21:19:43 +0000 (14:19 -0700)]
Frameworks/base: Fix always-false equals
Rect != Insets.
Change-Id: I3d4ff890608e446b51f09a1b633af742f0c069d4
Andreas Gampe [Sun, 15 Mar 2015 21:10:23 +0000 (14:10 -0700)]
Frameworks/base: Fix missing cast
Without a cast, the division is integer division.
Change-Id: I050e53778de8b1591a0be16ebbee8eed70eb1528
Vinit Deshpande [Sun, 15 Mar 2015 19:57:42 +0000 (12:57 -0700)]
Fixing build after merge from mirror-m-wireless-internal-release
There have been few breaking changes
1. TelecomManager.getCallCapablePhoneAccounts is not hidden anymore
2. CAPABILITY_VIDEO_CALLING is not hidden anymore
3. mPhoneStateListener doesn't exist anymore, so it is commented out
Change-Id: I22221eda73a20c745e316d9d56f914ab17b83533
Vinit Deshpande [Sun, 15 Mar 2015 20:44:36 +0000 (13:44 -0700)]
am "am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge:
c984826"
merged from goog/mirror-m-wireless-internal-release
1ef2b92 am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list. automerge:
c984826
Vinit Deshpande [Sun, 15 Mar 2015 20:44:35 +0000 (13:44 -0700)]
am "am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list."
merged from goog/mirror-m-wireless-internal-release
c984826 am
db56b5a6: Move Noto Sans Tai Le to the end of the font fallback list.
Vinit Deshpande [Sun, 15 Mar 2015 20:44:34 +0000 (13:44 -0700)]
am "am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge:
713e7cc"
merged from goog/mirror-m-wireless-internal-release
fbabcb0 am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev automerge:
713e7cc
Vinit Deshpande [Sun, 15 Mar 2015 20:44:33 +0000 (13:44 -0700)]
am "am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge:
3a5a410"
merged from goog/mirror-m-wireless-internal-release
d5e957c am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs automerge:
3a5a410
Vinit Deshpande [Sun, 15 Mar 2015 20:44:32 +0000 (13:44 -0700)]
am "am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev"
merged from goog/mirror-m-wireless-internal-release
713e7cc am
c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev
Vinit Deshpande [Sun, 15 Mar 2015 20:44:31 +0000 (13:44 -0700)]
am "am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge:
5c69ca2"
merged from goog/mirror-m-wireless-internal-release
2561d87 am
71ba1230: am
efc09c64: am
78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev automerge:
5c69ca2
Vinit Deshpande [Sun, 15 Mar 2015 20:44:30 +0000 (13:44 -0700)]
am "am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge:
49d3c36"
merged from goog/mirror-m-wireless-internal-release
ad04942 am
b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev automerge:
49d3c36
Vinit Deshpande [Sun, 15 Mar 2015 20:44:29 +0000 (13:44 -0700)]
am "am
71518174: Merge "Fix project settings." into lmp-mr1-dev automerge:
4abf088"
merged from goog/mirror-m-wireless-internal-release
746db9c am
71518174: Merge "Fix project settings." into lmp-mr1-dev automerge:
4abf088
Vinit Deshpande [Sun, 15 Mar 2015 20:44:28 +0000 (13:44 -0700)]
am "am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge:
26f672a"
merged from goog/mirror-m-wireless-internal-release
4f221f0 am
b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev automerge:
26f672a
Vinit Deshpande [Sun, 15 Mar 2015 20:44:26 +0000 (13:44 -0700)]
am "am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs"
merged from goog/mirror-m-wireless-internal-release
3a5a410 am
0146922a: am
633f4829: am
7256fb4f: am
a6b0ddb7: Merge "docs: build image updates" into lmp-docs
OSDN Git Service
