Makoto Onuki a6e0addc26 Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7 ...

am: a178d194f9

Change-Id: Iec712211a2c83798ae160560d1cca9ce23b7e577

2017-06-06 17:00:17 +00:00

..

java

Merge "Refer to ShortcutManagerCompat in the javadoc" into oc-dev am: a9c185f6e7

2017-06-06 17:00:17 +00:00

jni

Merge "ActivityManagerService: Add support for new stack dumping scheme."

2017-06-05 08:43:09 +00:00

proto/android

Prune unused static libs and instant apps if space needed am: f36d53cbfc

2017-05-31 03:59:35 +00:00

res

Merge "Add ERI (enhanced roaming indicator) 66 to list of home ERIs for Verizon" into oc-dev am: 4deefdbe7a

2017-06-06 16:01:01 +00:00

tests

Fix failing ActionBarContainerTest#testFloatingActionModesAreBubbledUp

2017-06-05 19:41:18 +01:00