Ricardo Cervera
23dac82dd3
am de71dd5c: am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit 'de71dd5cb47509011099f08ae872de5f2c945775':
docs: Add link to "Voice search in your app" video.
2014-11-19 00:19:28 +00:00
Ricardo Cervera
de71dd5cb4
am 92ad1d81: am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit '92ad1d8107e66274f226e9e3159283bb8fe3765a':
docs: Add link to "Voice search in your app" video.
2014-11-19 00:09:27 +00:00
Ricardo Cervera
92ad1d8107
am b2a2d2c2: am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit 'b2a2d2c2fe4a8c4794d3025bc10c00404bf79cd8':
docs: Add link to "Voice search in your app" video.
2014-11-18 23:31:27 +00:00
Ricardo Cervera
b2a2d2c2fe
am e9fddfd8: am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit 'e9fddfd802f9d00dd2d86bd78e3da3cc2f530d3c':
docs: Add link to "Voice search in your app" video.
2014-11-18 23:26:41 +00:00
Ricardo Cervera
e9fddfd802
am 0d18b091: Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
...
* commit '0d18b091eb5bb5be6f7142821b674e1648158a11':
docs: Add link to "Voice search in your app" video.
2014-11-18 23:21:29 +00:00
Ricardo Cervera
0d18b091eb
Merge "docs: Add link to "Voice search in your app" video." into lmp-docs
2014-11-18 23:16:22 +00:00
Andreas Gampe
f1b5abee92
am 12c172a8: Merge "Frameworks/base: Compiled-classes support"
...
* commit '12c172a8015027caae4265ac9bd86cf907723a5b':
Frameworks/base: Compiled-classes support
2014-11-18 22:57:45 +00:00
Andreas Gampe
2e706eb5b7
am f1c84568: am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
...
* commit 'f1c84568bc48d51ace404452c9e18250c4d36de4':
Frameworks/base: Compiled-classes support
2014-11-18 22:57:02 +00:00
Andreas Gampe
f1c84568bc
am 2a20f425: Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
...
* commit '2a20f425580b48ec5c130e77eb2a447731e37381':
Frameworks/base: Compiled-classes support
2014-11-18 22:52:25 +00:00
Andreas Gampe
12c172a801
Merge "Frameworks/base: Compiled-classes support"
2014-11-18 22:49:13 +00:00
Andreas Gampe
01dbe73976
am 8462913d: Merge "Frameworks/base: Ignore unknown pragmas in core/jni"
...
* commit '8462913d0c19973901a861749b4abbaacdf4b477':
Frameworks/base: Ignore unknown pragmas in core/jni
2014-11-18 22:48:42 +00:00
Andreas Gampe
f59fb28cb8
Frameworks/base: Compiled-classes support
...
Let AndroidRuntime check for /system/etc/compiled-classes and push
it to the runtime for boot image creation.
Bug: 18410571
(cherry picked from commit ca775941f3b7981aabf3a6a3b84d6c94f4f76aff)
Change-Id: I2510316381f2661166af24d7e14b013f4e045556
2014-11-18 14:48:31 -08:00
Andreas Gampe
2a20f42558
Merge "Frameworks/base: Compiled-classes support" into lmp-mr1-dev
2014-11-18 22:45:50 +00:00
Andreas Gampe
8462913d0c
Merge "Frameworks/base: Ignore unknown pragmas in core/jni"
2014-11-18 22:39:30 +00:00
Andreas Gampe
26109fd328
Frameworks/base: Ignore unknown pragmas in core/jni
...
Preparation for a switch to Clang.
Change-Id: Iabe1d79474a617bec66dd4bf58002b1a372f6d23
2014-11-18 14:38:00 -08:00
Marco Nelissen
7f8040a804
am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev
...
* commit '0acbed256eaadd3e704942405d130729d3366534':
Use stream type if set by user
2014-11-18 22:30:03 +00:00
Quddus Chong
86b7699875
am 53dc7c56: am 25f20bde: am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit '53dc7c56dac9daf723844e14ba0833a54a9a209c':
docs: Fixed bugs for Auto docs.
2014-11-18 22:25:45 +00:00
Chris Craik
de81cf0c31
am 22e8e8ef: am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev
...
* commit '22e8e8ef57ecef6fe7b3489c3c16babfda017435':
Fix missing ellipsis when just one character is truncated
2014-11-18 22:25:39 +00:00
Marco Nelissen
0acbed256e
am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev
...
* commit '6104fb2862e591fcd62660f5cd11ab5ca48adebb':
Use stream type if set by user
2014-11-18 22:25:12 +00:00
Quddus Chong
53dc7c56da
am 25f20bde: am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit '25f20bdeab04c72b4fda405ad1bfbd2ed42ff121':
docs: Fixed bugs for Auto docs.
2014-11-18 22:20:53 +00:00
Chris Craik
22e8e8ef57
am bde9ffbd: Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev
...
* commit 'bde9ffbd56cb420b51f11ca05b5225c1953f048d':
Fix missing ellipsis when just one character is truncated
2014-11-18 22:20:48 +00:00
Marco Nelissen
6104fb2862
Merge "Use stream type if set by user" into lmp-mr1-dev
2014-11-18 22:20:05 +00:00
Quddus Chong
25f20bdeab
am 09cf0729: am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit '09cf0729a3b21e7106918cf3690e881a1860ae8b':
docs: Fixed bugs for Auto docs.
2014-11-18 22:17:53 +00:00
Chris Craik
bde9ffbd56
Merge "Fix missing ellipsis when just one character is truncated" into lmp-mr1-dev
2014-11-18 22:17:35 +00:00
Abhijith Shastry
ef5c2d53a6
am cc472e66: am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev
...
* commit 'cc472e66ef4ab6dc7e369bbf2c9da737bea98a39':
Adding more javadocs to Carrier messaging API.
2014-11-18 22:16:30 +00:00
Quddus Chong
09cf0729a3
am f256d7ac: am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit 'f256d7ac189e58a6c21a5a71e5a1dddeab2d576f':
docs: Fixed bugs for Auto docs.
2014-11-18 22:13:06 +00:00
Abhijith Shastry
cc472e66ef
am 6807e5f0: Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev
...
* commit '6807e5f0feac3cfc85e9fe74378b94bc32a141c5':
Adding more javadocs to Carrier messaging API.
2014-11-18 22:10:09 +00:00
Quddus Chong
f256d7ac18
am 4741fb4b: docs: Fixed bugs for Auto docs.
...
* commit '4741fb4bb146909fc133ae37ea43dbb7f9edbd04':
docs: Fixed bugs for Auto docs.
2014-11-18 22:08:10 +00:00
Abhijith Shastry
6807e5f0fe
Merge "Adding more javadocs to Carrier messaging API." into lmp-mr1-dev
2014-11-18 22:04:58 +00:00
Alan Viverette
098f36c302
am a4733b68: am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev
...
* commit 'a4733b68c4ccc19794e9eadcad4e1ec6691c5be2':
Don't ignore accessibility overlays during visibility computation
2014-11-18 21:56:11 +00:00
Amit Mahajan
51064ec6f0
am ca1e3e5e: am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev
...
* commit 'ca1e3e5e830c1e2eb63a3653117bb6c9c0589ebe':
Telephony: STK CC feature implementation
2014-11-18 21:56:06 +00:00
John Reck
de620d06ff
am 51ce9cac: am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit '51ce9cacb66d1ddac115c15375ca174d8b3eaf79':
Don't invalidate() on setClipBounds
2014-11-18 21:51:40 +00:00
Alan Viverette
a4733b68c4
am fb11949d: Merge "Don\'t ignore accessibility overlays during visibility computation" into lmp-mr1-dev
...
* commit 'fb11949d5bb810b39e34ec707fcddde345c474cd':
Don't ignore accessibility overlays during visibility computation
2014-11-18 21:51:31 +00:00
Amit Mahajan
ca1e3e5e83
am 2733ea76: Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev
...
* commit '2733ea767b691ada9faabfd41f4175d320053682':
Telephony: STK CC feature implementation
2014-11-18 21:51:16 +00:00
Alan Viverette
fb11949d5b
Merge "Don't ignore accessibility overlays during visibility computation" into lmp-mr1-dev
2014-11-18 21:48:13 +00:00
Amit Mahajan
2733ea767b
Merge "Telephony: STK CC feature implementation" into lmp-mr1-dev
2014-11-18 21:46:51 +00:00
Quddus Chong
4741fb4bb1
docs: Fixed bugs for Auto docs.
...
Change-Id: Iba8406a95374e5c621eb607c6bb0a8ad6a892f59
2014-11-18 13:46:44 -08:00
John Reck
51ce9cacb6
am 37cdc191: Merge "Don\'t invalidate() on setClipBounds" into lmp-mr1-dev
...
* commit '37cdc191e380cca8edcc58f116b9b319bea1c140':
Don't invalidate() on setClipBounds
2014-11-18 21:46:44 +00:00
John Reck
cff98630e7
am fcd38813: am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit 'fcd38813efad32f13d472ef6e99e47b3b9db8f28':
Fix invalidateOutline
2014-11-18 21:45:13 +00:00
John Reck
37cdc191e3
Merge "Don't invalidate() on setClipBounds" into lmp-mr1-dev
2014-11-18 21:41:17 +00:00
John Reck
fcd38813ef
am 3cf61d4b: Merge "Fix invalidateOutline" into lmp-mr1-dev
...
* commit '3cf61d4b79a22f89b8fb839ef9ee2146fac4e703':
Fix invalidateOutline
2014-11-18 21:37:40 +00:00
John Reck
842697a360
am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
...
* commit 'decc26df39b734ca1cbaccda1cbe3b355eba6898':
Trace some interesting events
2014-11-18 21:33:19 +00:00
John Reck
3cf61d4b79
Merge "Fix invalidateOutline" into lmp-mr1-dev
2014-11-18 21:30:48 +00:00
John Reck
decc26df39
am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev
...
* commit 'f0f68117c432edd5aea406e773ec5bd372976eec':
Trace some interesting events
2014-11-18 21:29:15 +00:00
John Reck
f0f68117c4
Merge "Trace some interesting events" into lmp-mr1-dev
2014-11-18 21:23:50 +00:00
Preeti Ahuja
d4180cc2d4
Telephony: STK CC feature implementation
...
Add strings and constants required for stk cc feature.
Bug: 17646476
Change-Id: I28c5c199f6138c4db2a00d524592667a481db8cd
2014-11-18 13:01:02 -08:00
Ye Wen
1ec9c526c1
am 818b239d: am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
...
* commit '818b239d0025a28dfdedca40ac60ebc85f1fc8ff':
Addressing API review issues for SmsManager (2/3)
2014-11-18 20:40:52 +00:00
Ye Wen
818b239d00
am f984eb42: Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
...
* commit 'f984eb42724e66326549d7bf33a7ec1515a7ff3c':
Addressing API review issues for SmsManager (2/3)
2014-11-18 20:37:02 +00:00
Adrian Roos
80c23e3c7f
am e672db28: am ed097689: Merge "Add animations for the system bar color views" into lmp-mr1-dev
...
* commit 'e672db2801c3eedbdf548c71dfa6cf048f91315d':
Add animations for the system bar color views
2014-11-18 20:32:28 +00:00
Ye Wen
f984eb4272
Merge "Addressing API review issues for SmsManager (2/3)" into lmp-mr1-dev
2014-11-18 20:30:29 +00:00