| commit | d0fd8cbd1d1fcfe85c7b03821c2dc400395c9900 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Tue Oct 20 18:36:27 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 18:36:27 2015 +0000 |
| tree | 57d14e861db9aa0efc9255a99d052cdc552a5e65 | |
| parent | 27ddeff723eba240899d6f1860a08314e9d2d7ad [diff] | |
| parent | 8af0a9eddf4611a32a871af2fa87fe908ff261f5 [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