| commit | ddee7d949dbd1fd5d18e11322532e78cd8330554 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jan 11 14:57:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 14:57:38 2016 +0000 |
| tree | b64520b487c96afa51a8fa117733868e4011bccc | |
| parent | 38aaa9981a62b0978c65f86f22102383bb2d5f01 [diff] | |
| parent | 7053b8926f0c1f72531989d626a195285c679f98 [diff] |
Merge branch 'mnc-dr1.5-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr1.5-dev