Makoto Onuki 2e83edb4b0 Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities.""

2017-01-06 21:32:35 +00:00

..

java

Merge "Revert "ShortcutManager: Floating shortcuts shouldn't have target activities.""

2017-01-06 21:32:35 +00:00

jni

Merge changes I68d56d76,Iad432577

2017-01-06 20:36:41 +00:00

proto/android

Clean up file names for protos

2016-12-20 22:28:56 -08:00

res

bools: fix use_lock_pattern_drawable javadoc.

2017-01-06 10:23:56 -08:00

tests

Merge "Fix LOCAL_SDK_VERSION of 3 multidex apks" am: 43c98c74fe am: ef5d1cb3b4 am: 1c0070aa5d

2017-01-06 09:53:42 +00:00