| commit | aff21924fe1aac17baf9f9c3d9e2940c2179883b | [log] [tgz] |
|---|---|---|
| author | Casey Dahlin <sadmac@google.com> | Thu Oct 19 09:52:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 09:52:35 2017 +0000 |
| tree | 947c21da5985fc3bc9de607ad835a9ede000f157 | |
| parent | ababac329a13d4a2394482687da51c372a4f2162 [diff] | |
| parent | d706594edc437056f59769242ba8d443de958536 [diff] |
Merge "Merge "Revert "Add UiThreadTest annotation to ActivityKeyboardShortcutsTest"" into oc-mr1-dev am: 2b77c736e7" into oc-mr1-dev-plus-aosp am: d706594edc Change-Id: If4fce874a2c07d10f089e22c9e9aef1ddc53a50b