OSDN Git Service
Wonsik Kim [Sun, 20 Jul 2014 18:03:49 +0000 (18:03 +0000)]
am
1042ee6b: am
b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
* commit '
1042ee6be6294ad07ccda31571641996abc88bde':
TIF: misc fix for TvInputHal
Lajos Molnar [Sun, 20 Jul 2014 18:03:40 +0000 (18:03 +0000)]
am
cebc7989: am
1717dea8: Extend MediaCodecInfo to describe usable codec limits and features
* commit '
cebc7989d7a4fa16396ed4b3be6d1922cefaea24':
Extend MediaCodecInfo to describe usable codec limits and features
Jeff Brown [Sun, 20 Jul 2014 18:03:35 +0000 (18:03 +0000)]
am
958361e9: am
25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
* commit '
958361e92371fd7d3b40fbbd91077ec4d7abe374':
Allow dreams to wake up gently.
Dongwon Kang [Sun, 20 Jul 2014 18:03:30 +0000 (18:03 +0000)]
am
c90b613c: am
c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
* commit '
c90b613ca3cbe21c871c0b98ed3ceabe2a7a3a09':
TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
Jeff Brown [Sun, 20 Jul 2014 18:03:26 +0000 (18:03 +0000)]
am
610014e6: am
03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
* commit '
610014e6501d3543f33aedcc7f302288afcc4df4':
Add new Display.STATE_DOZE_SUSPEND power state.
Jae Seo [Sun, 20 Jul 2014 18:03:09 +0000 (18:03 +0000)]
am
c936967b: am
0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
* commit '
c936967b84ef7ba70f948bcd99b8355fbdd3c9a4':
TIF: Add a way to notify whether the current program content is allowed
John Reck [Sun, 20 Jul 2014 18:02:59 +0000 (18:02 +0000)]
am
761e298b: am
b09a6670: Return Animator instead of ValueAnimator
* commit '
761e298b11b31233067daf215ab788bb7042dc33':
Return Animator instead of ValueAnimator
Fabrice Di Meglio [Sun, 20 Jul 2014 18:02:54 +0000 (18:02 +0000)]
am
6b64ac48: am
3a4701fa: Revert "Fix LocalePicker background"
* commit '
6b64ac48e0479b84859138907a0ebae88393130b':
Revert "Fix LocalePicker background"
Wei Wang [Sun, 20 Jul 2014 18:02:30 +0000 (18:02 +0000)]
am
6e065374: am
5cb5ae18: More API modification of BLE APIs (1/2).
* commit '
6e065374f53801f4c90c73cadd33157a7c22f900':
More API modification of BLE APIs (1/2).
Jean-Michel Trivi [Sun, 20 Jul 2014 18:01:58 +0000 (18:01 +0000)]
am
895de04e: am
fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
* commit '
895de04e7ca22494e46f20064e2133fc1f915d56':
Add AudioAttributes to stream type conversion
Jean-Michel Trivi [Sun, 20 Jul 2014 18:01:51 +0000 (18:01 +0000)]
am
bece8116: am
01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev
* commit '
bece8116fa302b1ea770d7580941c0ce6a500833':
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Quddus Chong [Sun, 20 Jul 2014 18:01:38 +0000 (18:01 +0000)]
am
92f7993e: am
a7112918: am
9fc983f5: am
f0804df1: am
349e5760: docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
* commit '
92f7993e56759dc06c9149654f40bcbffd9b281b':
docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:34 +0000 (18:01 +0000)]
am
2895133f: am
6b1ceb42: am
296459ff: am
f4989910: am
d32dd294: am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for st
* commit '
2895133f602caff7a8f610c001a546c19c60c67b':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:29 +0000 (18:01 +0000)]
am
4ed3d208: am
59987f2d: am
5d6322a5: (-s ours) am
ad3ccc74: am
3f51ab0d: am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" int
* commit '
4ed3d2089f3f2f45da9c4103a0ebbcb6595b060c':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:25 +0000 (18:01 +0000)]
am
05900237: am
78bbb2a1: am
90824671: (-s ours) am
98b24366: am
c35afdfd: am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
059002370db91392218ad3250a112438cf7a5038':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:21 +0000 (18:01 +0000)]
am
583b6898: am
fe48ca3e: am
4ff3c7f0: (-s ours) am
08840806: am
7f98066d: am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
583b68980fd0e1ffac3afe2caf62d7b62dbc3890':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:16 +0000 (18:01 +0000)]
am
13ebecfe: am
d0eed243: am
276ae4ee: (-s ours) am
8613f826: am
efd29681: am
964591a6: am
c3a7763b: (-s ours) am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
13ebecfe89e35724736303e677256a7eeee4b3b4':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:12 +0000 (18:01 +0000)]
am
d2966fce: am
2e11bba3: am
0804e0ad: (-s ours) am
a9e488a6: am
d8d3e87c: am
4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '
d2966fce19e04ffc23eb7ecfb65a305c6a22c044':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sun, 20 Jul 2014 18:01:08 +0000 (18:01 +0000)]
am
03b8f56a: am
1ab77f96: am
d7f2bf06: (-s ours) am
f75489f2: am
c425c438: am
710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
03b8f56a781a231ec11906ea479d8d5490108f24':
Fix default level flags for bidi. [DO NOT MERGE]
Guang Zhu [Sun, 20 Jul 2014 18:00:51 +0000 (18:00 +0000)]
am
1931c1c3: am
5a0f7e41: am
f59ce468: am
b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit '
1931c1c324908620dc1a875934afea68db0b6d1d':
add command to enable bt snoop log
Jean-Michel Trivi [Sun, 20 Jul 2014 18:00:37 +0000 (18:00 +0000)]
am
abc7f117: am
981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
* commit '
abc7f117bf1f8717bc9c62c4762f9c38e15b0fc6':
Hide AudioManager.startBluetoothScoVirtualCall()
Santos Cordon [Sun, 20 Jul 2014 18:00:22 +0000 (18:00 +0000)]
am
52cfd31e: am
db2f81b0: Fixing ADD_CALL (1/3)
* commit '
52cfd31ed48fdacc0ed11d1f2db7eea7f3a17fef':
Fixing ADD_CALL (1/3)
Chris Craik [Sun, 20 Jul 2014 18:00:13 +0000 (18:00 +0000)]
am
7339d993: am
e25d7792: Merge "Tweaks to outline API" into lmp-dev
* commit '
7339d99353deaabfe67b421d3b1d7591c3c74d98':
Tweaks to outline API
Adam Powell [Sun, 20 Jul 2014 18:00:09 +0000 (18:00 +0000)]
am
186802ac: am
d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
* commit '
186802acd1c36b4194804857d9e52e24b74b31cc':
Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
Yorke Lee [Sun, 20 Jul 2014 18:00:00 +0000 (18:00 +0000)]
am
c5989521: am
c5a8e2f1: Rename voicemail permissions
* commit '
c59895217922428d3a34ae9635aba7fc4b4f7fc4':
Rename voicemail permissions
Shishir Agrawal [Sun, 20 Jul 2014 17:59:51 +0000 (17:59 +0000)]
am
b8addfa0: am
47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
* commit '
b8addfa04c98c7c49862150ab6702728fb98a953':
Adding the ability for carrier app to override SPN and carrier name.
Christopher Tate [Sun, 20 Jul 2014 17:59:46 +0000 (17:59 +0000)]
am
32523262: am
12e9b896: Fix which index goes where
* commit '
32523262b62c4598ffd50873d290c1c601b9f842':
Fix which index goes where
Sreeram Ramachandran [Sun, 20 Jul 2014 17:59:41 +0000 (17:59 +0000)]
am
5e23de19: am
4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
* commit '
5e23de196c3ac98e5a0da88515bad5d985d348d9':
Allow VPN interfaces to be put into blocking mode.
Winson Chung [Sun, 20 Jul 2014 02:19:27 +0000 (02:19 +0000)]
am
c655f3a4: am
51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
* commit '
c655f3a4487d5f810b392460227f0bad91c2768c':
Add setting to guard the lock-to-app recents icon
Winson Chung [Sun, 20 Jul 2014 02:19:22 +0000 (02:19 +0000)]
am
10b49835: am
d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug
16322100)
* commit '
10b49835cf7496f76e521b14b837326e80ac93e1':
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Ihab Awad [Sun, 20 Jul 2014 02:19:15 +0000 (02:19 +0000)]
am
b8c46e3a: am
98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev
* commit '
b8c46e3a932f5666c0921b84416d8dfd7a40d727':
Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
Ricardo Cervera [Sun, 20 Jul 2014 02:19:04 +0000 (02:19 +0000)]
am
7d808d32: am
3b74e378: am
9c36b835: am
7a425360: am
25303a98: Merge "docs: Fixed RecyclerView example. Bug:
15973665" into klp-modular-docs
* commit '
7d808d3201675401cb42cc036792f46ccb96cd4a':
docs: Fixed RecyclerView example. Bug:
15973665
Robert Ly [Sun, 20 Jul 2014 02:19:00 +0000 (02:19 +0000)]
am
c58fee40: am
ec571ec0: am
ee65b63d: am
049cadd8: am
f1b18ded: Merge "docs: Fix typo in Wear docs. Bug:
16327298" into klp-modular-docs
* commit '
c58fee40bc72569ff36f186d8f97e708393a0c24':
docs: Fix typo in Wear docs. Bug:
16327298
Prashant Malani [Sun, 20 Jul 2014 02:18:56 +0000 (02:18 +0000)]
am
80c212a1: am
269ac24f: am
162d9433: (-s ours) am
9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev
* commit '
80c212a1c54f1fa9c6477f3c36b90e5a38a9d83d':
Make the booting flag update unconditional
Amith Yamasani [Sun, 20 Jul 2014 02:18:46 +0000 (02:18 +0000)]
am
3d160098: am
65d3279b: Merge "Add a hidden API to expose cross profile caller id check" into lmp-dev
* commit '
3d1600980675bdd5ba40c9b9633e772031c70108':
Add a hidden API to expose cross profile caller id check
Prashant Malani [Sun, 20 Jul 2014 02:18:41 +0000 (02:18 +0000)]
am
af5f3b92: am
c61f26fa: Make the booting flag update unconditional
* commit '
af5f3b92a7acec0301067ed1cdad857056326e3b':
Make the booting flag update unconditional
Yin-Chia Yeh [Sun, 20 Jul 2014 02:18:36 +0000 (02:18 +0000)]
am
372461a1: am
861dd642: Merge "Camera2: add highSpeedVideoConfig wrapper and APIs" into lmp-dev
* commit '
372461a12e3787d829ae2f300e0592ab11972c80':
Camera2: add highSpeedVideoConfig wrapper and APIs
Dake Gu [Sun, 20 Jul 2014 02:18:26 +0000 (02:18 +0000)]
am
f31b6a29: am
bd497879: ActivityTransition: fix wrong width/height applied to sharedelement.
* commit '
f31b6a29ce3fe6cb37668463aaf63e27fa2741de':
ActivityTransition: fix wrong width/height applied to sharedelement.
Andre Eisenbach [Sun, 20 Jul 2014 02:18:13 +0000 (02:18 +0000)]
am
1f961f2c: am
decb3109: Merge "Reduce GATT logging output" into lmp-dev
* commit '
1f961f2c95140780e8f63b081a7493508c76a240':
Reduce GATT logging output
Niels Egberts [Sun, 20 Jul 2014 02:17:59 +0000 (02:17 +0000)]
am
860e2f9f: am
40268fc5: Merge "Add money as a new TtsSpan type." into lmp-dev
* commit '
860e2f9f485ebc81dfad269cca183fee3d03e583':
Add money as a new TtsSpan type.
Adam Lesinski [Sun, 20 Jul 2014 02:17:49 +0000 (02:17 +0000)]
am
b11e7d48: am
e0b92a6b: First iteration of a public UsageStats API
* commit '
b11e7d48398c8e6e57578dabcf71eeef6a4e8bfd':
First iteration of a public UsageStats API
John Reck [Sun, 20 Jul 2014 02:17:41 +0000 (02:17 +0000)]
am
0572b33d: am
3406fe19: Add RT-enabled reveal animator
* commit '
0572b33d35d4c6f88d6a720f9b71e0b963c95f1e':
Add RT-enabled reveal animator
Zhijun He [Sun, 20 Jul 2014 02:17:31 +0000 (02:17 +0000)]
am
b6236012: am
3ea4b9d0: Camera2: send the partial result with onCaptureProgressed
* commit '
b62360123f2d4dbf191319ba671bc3781c1a3bf5':
Camera2: send the partial result with onCaptureProgressed
Sailesh Nepal [Sun, 20 Jul 2014 02:17:27 +0000 (02:17 +0000)]
am
d0e9c227: am
92119b9f: Merge "Add Connection.startActivityFromInCall" into lmp-dev
* commit '
d0e9c2273cdaf9919956c5b36298ab1ba62004cf':
Add Connection.startActivityFromInCall
Jean-Michel Trivi [Sun, 20 Jul 2014 02:17:22 +0000 (02:17 +0000)]
am
4298999e: am
115bf42b: Unhide Virtualizer.getVirtualizationMode()
* commit '
4298999e7500356b84bf30ef9b86a83358c2347b':
Unhide Virtualizer.getVirtualizationMode()
Sailesh Nepal [Sun, 20 Jul 2014 02:17:18 +0000 (02:17 +0000)]
am
f611c799: am
0587043f: Merge "Use main thread for RemoteConnection callbacks" into lmp-dev
* commit '
f611c799340afa4f306b9286183b0f4d3eec3ddd':
Use main thread for RemoteConnection callbacks
Jim Miller [Sun, 20 Jul 2014 02:17:13 +0000 (02:17 +0000)]
am
656d09ed: am
0f6db1e8: Merge "Add DevicePolicyManager flag for fingerprint." into lmp-dev
* commit '
656d09edfddcc748fa56acd455f579cc08057848':
Add DevicePolicyManager flag for fingerprint.
Ye Wen [Sun, 20 Jul 2014 02:17:09 +0000 (02:17 +0000)]
am
1100f339: am
2c960085: Merge "Unhide MMS APIs for MSIM (1/2)" into lmp-dev
* commit '
1100f339df1e089d69690aae5a39ee39f1cc694f':
Unhide MMS APIs for MSIM (1/2)
Dan Sandler [Sun, 20 Jul 2014 02:17:05 +0000 (02:17 +0000)]
am
cd307ff0: am
5239e4d2: Don\'t crash if user profile bitmap is null.
* commit '
cd307ff07f3d915f23bb8a2782bf9b08b39aafaf':
Don't crash if user profile bitmap is null.
Robert Greenwalt [Sun, 20 Jul 2014 02:17:01 +0000 (02:17 +0000)]
am
8a717ee8: am
721252c0: Quit NetworkMonitors at end of life.
* commit '
8a717ee8b26cdd6d916818451add978c1776bd6e':
Quit NetworkMonitors at end of life.
Wonsik Kim [Sat, 19 Jul 2014 11:39:28 +0000 (11:39 +0000)]
am
b872b220: Merge "TIF: misc fix for TvInputHal" into lmp-dev
* commit '
b872b220bb1ef88a62c7765b1156d1a1615e533f':
TIF: misc fix for TvInputHal
Lajos Molnar [Sat, 19 Jul 2014 11:39:24 +0000 (11:39 +0000)]
am
1717dea8: Extend MediaCodecInfo to describe usable codec limits and features
* commit '
1717dea892e10b9a5c4797c8fdd4e8d64838e556':
Extend MediaCodecInfo to describe usable codec limits and features
Jeff Brown [Sat, 19 Jul 2014 11:39:14 +0000 (11:39 +0000)]
am
25892fe6: Merge "Allow dreams to wake up gently." into lmp-dev
* commit '
25892fe6ac568638b0420ca0e8cb388c133bc14e':
Allow dreams to wake up gently.
Dongwon Kang [Sat, 19 Jul 2014 11:39:10 +0000 (11:39 +0000)]
am
c292f54f: Merge "TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case." into lmp-dev
* commit '
c292f54f26b6be7e6652f44ac96e7ef59756abb2':
TIF: introduce TvInputPassthroughWrapperService class to support 2-way pairing use-case.
Jeff Brown [Sat, 19 Jul 2014 11:39:06 +0000 (11:39 +0000)]
am
03fb5270: Add new Display.STATE_DOZE_SUSPEND power state.
* commit '
03fb52700991064432971f79c71cef336e2762df':
Add new Display.STATE_DOZE_SUSPEND power state.
Lajos Molnar [Fri, 18 Jul 2014 19:10:33 +0000 (12:10 -0700)]
Extend MediaCodecInfo to describe usable codec limits and features
Bug:
11990470
Bug:
12065651
Bug:
16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
Jeff Brown [Fri, 18 Jul 2014 01:50:18 +0000 (18:50 -0700)]
Add new Display.STATE_DOZE_SUSPEND power state.
Change-Id: Ia62f4f0d25234281dc600d0b7f08b3c6a312db7a
Jae Seo [Sat, 19 Jul 2014 03:27:01 +0000 (03:27 +0000)]
am
0c2b6c52: Merge "TIF: Add a way to notify whether the current program content is allowed" into lmp-dev
* commit '
0c2b6c52d626681b1ac32f79c246be4c5a82a991':
TIF: Add a way to notify whether the current program content is allowed
John Reck [Sat, 19 Jul 2014 02:03:05 +0000 (02:03 +0000)]
am
b09a6670: Return Animator instead of ValueAnimator
* commit '
b09a667056aa3fba5a05d29f7e073c3640888c26':
Return Animator instead of ValueAnimator
Fabrice Di Meglio [Sat, 19 Jul 2014 02:03:01 +0000 (02:03 +0000)]
am
3a4701fa: Revert "Fix LocalePicker background"
* commit '
3a4701fa23c9b726173deb0c0450ceed023da217':
Revert "Fix LocalePicker background"
John Reck [Fri, 18 Jul 2014 23:22:09 +0000 (16:22 -0700)]
Return Animator instead of ValueAnimator
Change-Id: I29a7cfdc7ffbb3a4d33f9e64f9d7ca791f5c947c
Fabrice Di Meglio [Sat, 19 Jul 2014 01:57:27 +0000 (01:57 +0000)]
Revert "Fix LocalePicker background"
This reverts commit
6bbea8cf4252839d0c6f2a3152f506a7b2b2d753.
Change-Id: I430c725c8e5987fb643528594ef3a9a83827e7be
Wei Wang [Sat, 19 Jul 2014 01:36:48 +0000 (01:36 +0000)]
am
5cb5ae18: More API modification of BLE APIs (1/2).
* commit '
5cb5ae18a83c6e8d6e3b935ccd7e2e7e94eec721':
More API modification of BLE APIs (1/2).
Wei Wang [Thu, 17 Jul 2014 05:02:03 +0000 (22:02 -0700)]
More API modification of BLE APIs (1/2).
Changed include:
1) Add serviceDataUuid to filter so it matches sanRecord and
AdvertiseData.
2) Add raw bytes to ScanRecord and make ScanResult take a ScanRecord
instead of raw bytes.
3) Change from setServiceUuid(List) to addServiceUuid(ParcelUuid).
4) Added include device name
5) Removed service not registered and added ADVERTISE_DATA_TOO_LARGE.
6) Fixed a few comments.
Change-Id: Ibbe07183b1293835c4a84728d1cd2d61e5d627d3
Jean-Michel Trivi [Sat, 19 Jul 2014 01:05:03 +0000 (01:05 +0000)]
am
fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
* commit '
fa19847302d7ecc5cf0e3342852ff40945acf309':
Add AudioAttributes to stream type conversion
Jean-Michel Trivi [Sat, 19 Jul 2014 00:54:59 +0000 (00:54 +0000)]
am
01e81000: Merge "Unhide AudioTrack constructor with AudioAttributes, AudioFormat" into lmp-dev
* commit '
01e810001dc6f73381aaa5499cfb3a3c92b60b1e':
Unhide AudioTrack constructor with AudioAttributes, AudioFormat
Quddus Chong [Sat, 19 Jul 2014 00:49:03 +0000 (00:49 +0000)]
am
a7112918: am
9fc983f5: am
f0804df1: am
349e5760: docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
* commit '
a711291844dfba2c0452f35561192c62010d4fed':
docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:58 +0000 (00:48 +0000)]
am
6b1ceb42: am
296459ff: am
f4989910: am
d32dd294: am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.
* commit '
6b1ceb4260ee8cfff84123b984142a361cd9a748':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:55 +0000 (00:48 +0000)]
am
59987f2d: am
5d6322a5: (-s ours) am
ad3ccc74: am
3f51ab0d: am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-de
* commit '
59987f2dab94e6a832eee4a93577bdc5bc6f1a58':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:52 +0000 (00:48 +0000)]
am
78bbb2a1: am
90824671: (-s ours) am
98b24366: am
c35afdfd: am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
78bbb2a1a140d199753fd61bdad6140449d96e63':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:48 +0000 (00:48 +0000)]
am
fe48ca3e: am
4ff3c7f0: (-s ours) am
08840806: am
7f98066d: am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
fe48ca3ec644635aa9267c97784f879bee1b984a':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:45 +0000 (00:48 +0000)]
am
d0eed243: am
276ae4ee: (-s ours) am
8613f826: am
efd29681: am
964591a6: am
c3a7763b: (-s ours) am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
d0eed243993e64f8b17147bbc66afe05733376a3':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:42 +0000 (00:48 +0000)]
am
2e11bba3: am
0804e0ad: (-s ours) am
a9e488a6: am
d8d3e87c: am
4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '
2e11bba3231078749352f371c8e9bb76e3039853':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:48:38 +0000 (00:48 +0000)]
am
1ab77f96: am
d7f2bf06: (-s ours) am
f75489f2: am
c425c438: am
710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
1ab77f9609c8966b960e2bcfbd7d5777aaa7dc24':
Fix default level flags for bidi. [DO NOT MERGE]
Quddus Chong [Sat, 19 Jul 2014 00:42:07 +0000 (00:42 +0000)]
am
9fc983f5: am
f0804df1: am
349e5760: docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
* commit '
9fc983f56af76d1abcbf95e6b3b35e506aa2fddd':
docs: Fixed bugs in Game Controller training doc. bug:
16375247,
14671463
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:59 +0000 (00:41 +0000)]
am
296459ff: am
f4989910: am
d32dd294: am
b86675f1: am
f2c5a9ee: (-s ours) am
b9efa1e5: am
14a4e69c: am
c7351974: (-s ours) am
a3966c66: am
62743940: am
8c71ff29: am
87234e85: am
9c48ab82: am
ccf7b2aa: am
5af7324a: Fix style resolution for styles with \'.\' [DO NOT ME
* commit '
296459ffbb9600a14be24c2cc06284ac47ea84c4':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:52 +0000 (00:41 +0000)]
am
5d6322a5: (-s ours) am
ad3ccc74: am
3f51ab0d: am
3c92b932: am
62b81acb: (-s ours) am
2df48bed: am
1bdfeadb: am
610341b3: (-s ours) am
95bbeb96: am
b8e4e8e1: am
d3ac01ff: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr1.1-dev
* commit '
5d6322a527c81fa261642582a508f39a617a206a':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:48 +0000 (00:41 +0000)]
am
90824671: (-s ours) am
98b24366: am
c35afdfd: am
cee55fc1: am
99286edc: (-s ours) am
aa0c1c75: am
e83fa180: am
696eb4da: (-s ours) am
c39916f7: am
37f54f4c: am
357ebfc5: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
90824671b6467919e7aa12a09a6c21797764bca3':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:43 +0000 (00:41 +0000)]
am
4ff3c7f0: (-s ours) am
08840806: am
7f98066d: am
4c312f20: am
a3d2c7e7: (-s ours) am
85c7b209: am
5efee91e: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into jb-mr2-dev
* commit '
4ff3c7f0072d1c56d241b234e7f208009c86112f':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:39 +0000 (00:41 +0000)]
am
276ae4ee: (-s ours) am
8613f826: am
efd29681: am
964591a6: am
c3a7763b: (-s ours) am
918ca12f: am
10395cbb: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
276ae4eee5450674fbc7e27f638f18ddc748b7f6':
Fix default level flags for bidi. [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:35 +0000 (00:41 +0000)]
am
0804e0ad: (-s ours) am
a9e488a6: am
d8d3e87c: am
4627c98d: Merge "Fix style resolution for styles with \'.\' [DO NOT MERGE]" into klp-dev
* commit '
0804e0aded17c1aee8cbd2c34247b390051123c3':
Fix style resolution for styles with '.' [DO NOT MERGE]
Deepanshu Gupta [Sat, 19 Jul 2014 00:41:31 +0000 (00:41 +0000)]
am
d7f2bf06: (-s ours) am
f75489f2: am
c425c438: am
710a55b4: Fix default level flags for bidi. [DO NOT MERGE]
* commit '
d7f2bf067fce644ed902122fffb9e22b6596a0ff':
Fix default level flags for bidi. [DO NOT MERGE]
Guang Zhu [Sat, 19 Jul 2014 00:40:28 +0000 (00:40 +0000)]
am
5a0f7e41: am
f59ce468: am
b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit '
5a0f7e414e9a41ebc3845d0158f59afd8899d8b1':
add command to enable bt snoop log
Jean-Michel Trivi [Sat, 19 Jul 2014 00:36:05 +0000 (00:36 +0000)]
am
981fcf46: Merge "Hide AudioManager.startBluetoothScoVirtualCall()" into lmp-dev
* commit '
981fcf46c2876541de3fe1e6c030899c582ae198':
Hide AudioManager.startBluetoothScoVirtualCall()
Guang Zhu [Sat, 19 Jul 2014 00:33:58 +0000 (00:33 +0000)]
am
f59ce468: am
b477fc6c: Merge "add command to enable bt snoop log" into klp-modular-dev
* commit '
f59ce46880ebe2c2466a2c862ec2ed401f635d51':
add command to enable bt snoop log
Santos Cordon [Sat, 19 Jul 2014 00:28:01 +0000 (00:28 +0000)]
am
db2f81b0: Fixing ADD_CALL (1/3)
* commit '
db2f81b07d0b29e2fff87be3293945fd9aeaf13d':
Fixing ADD_CALL (1/3)
Santos Cordon [Fri, 18 Jul 2014 20:40:29 +0000 (13:40 -0700)]
Fixing ADD_CALL (1/3)
Bug:
16241726
Change-Id: Ie1dd72a79c2430b10b0239dbdda5508edbc8eb26
Chris Craik [Sat, 19 Jul 2014 00:23:13 +0000 (00:23 +0000)]
am
e25d7792: Merge "Tweaks to outline API" into lmp-dev
* commit '
e25d7792af090ef3c692ad157c3cbfeadf1db7b8':
Tweaks to outline API
Adam Powell [Sat, 19 Jul 2014 00:23:09 +0000 (00:23 +0000)]
am
d0cb5fd8: Merge "Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER" into lmp-dev
* commit '
d0cb5fd810d1b9002c330435da89c1465deb8d37':
Add EXTRA_REPLACEMENT_EXTRAS for ACTION_CHOOSER
Yorke Lee [Sat, 19 Jul 2014 00:19:03 +0000 (00:19 +0000)]
am
c5a8e2f1: Rename voicemail permissions
* commit '
c5a8e2f13cc92802768aacac4ae3baa9676db422':
Rename voicemail permissions
Yorke Lee [Fri, 18 Jul 2014 23:24:29 +0000 (16:24 -0700)]
Rename voicemail permissions
Rename READ_ALL_VOICEMAIL to READ_VOICEMAIL, and MANAGE_VOICEMAIL
to WRITE_VOICEMAIL
Bug:
16400686
Change-Id: I4c87a7e2fb3aa71d7de3865301f110bcfb29221b
Shishir Agrawal [Sat, 19 Jul 2014 00:11:11 +0000 (00:11 +0000)]
am
47bbd460: Merge "Adding the ability for carrier app to override SPN and carrier name." into lmp-dev
* commit '
47bbd4608e423efd310a894b275724792268beba':
Adding the ability for carrier app to override SPN and carrier name.
Christopher Tate [Sat, 19 Jul 2014 00:06:46 +0000 (00:06 +0000)]
am
12e9b896: Fix which index goes where
* commit '
12e9b896f1fb40489a56e7ade81ffc807eb17065':
Fix which index goes where
Sreeram Ramachandran [Sat, 19 Jul 2014 00:06:43 +0000 (00:06 +0000)]
am
4000b01f: Merge "Allow VPN interfaces to be put into blocking mode." into lmp-dev
* commit '
4000b01f1eb14e6e1a4a9c1aa955193ced7d5d94':
Allow VPN interfaces to be put into blocking mode.
Christopher Tate [Sat, 19 Jul 2014 00:01:40 +0000 (17:01 -0700)]
Fix which index goes where
Change-Id: If4cf7efd4d7962eb5c10b487482653d86d92d2c6
Winson Chung [Fri, 18 Jul 2014 23:50:59 +0000 (23:50 +0000)]
am
51b044a2: Merge "Add setting to guard the lock-to-app recents icon" into lmp-dev
* commit '
51b044a29d73fc05c95ecf0e237efc531adbb3cb':
Add setting to guard the lock-to-app recents icon
Winson Chung [Fri, 18 Jul 2014 23:46:53 +0000 (23:46 +0000)]
am
d778b6f5: Fixing issue where we weren\'t restoring touch state on dismissed Task cards. (Bug
16322100)
* commit '
d778b6f58cfbe68d7ce5f769e4146d88d14bfdc6':
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Winson Chung [Fri, 18 Jul 2014 01:39:02 +0000 (18:39 -0700)]
Fixing issue where we weren't restoring touch state on dismissed Task cards. (Bug
16322100)
Ihab Awad [Fri, 18 Jul 2014 23:38:46 +0000 (23:38 +0000)]
am
98abc9d1: Merge "Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata" into lmp-dev
* commit '
98abc9d111449309a718c76842e9fef05f08f4bd':
Fix incomplete move of flags from PhoneAccount to PhoneAccountMetadata
Ricardo Cervera [Fri, 18 Jul 2014 23:23:35 +0000 (23:23 +0000)]
am
3b74e378: am
9c36b835: am
7a425360: am
25303a98: Merge "docs: Fixed RecyclerView example. Bug:
15973665" into klp-modular-docs
* commit '
3b74e3787a5853f6094f55d6649fadf4518c1cb5':
docs: Fixed RecyclerView example. Bug:
15973665
OSDN Git Service
