commit | 7e94976cb26072cafac8f2bb9552628465410a5d | [log] [tgz] |
---|---|---|
author | Jeff Sharkey <jsharkey@google.com> | Tue Oct 20 23:46:27 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 23:46:27 2015 +0000 |
tree | b4900b2bad946eeb996e144a44088b4d0cc17e06 | |
parent | c25f26a1d510115ccb427a71d0c45d455d6f2847 [diff] | |
parent | d0fd8cbd1d1fcfe85c7b03821c2dc400395c9900 [diff] |
Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp am: d0fd8cbd1d * commit 'd0fd8cbd1d1fcfe85c7b03821c2dc400395c9900':