commit | da3a7d4cff5b1269ce06e88d94271cb0d4502afa | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Mon Jan 11 15:02:10 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jan 11 15:02:10 2016 +0000 |
tree | c65bb49d781bae6e6ffd2ffd35b2a9c7e6ef27fa | |
parent | 188ed31261ed27b764feaa970ac8eea0ed59ff62 [diff] | |
parent | ddee7d949dbd1fd5d18e11322532e78cd8330554 [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 am: ddee7d949d * commit 'ddee7d949dbd1fd5d18e11322532e78cd8330554':