| commit | 5d3342b3d97ba68fbe015ff788859819673cff67 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sat May 17 05:50:57 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sat May 17 05:50:57 2014 -0700 |
| tree | 20e4f49c696bc04f251bc0228fefd1be6971003d | |
| parent | 0e4a21806a537a7f40121f6a981af95ac97de8ea [diff] | |
| parent | 837da9fd5917e863b5bea4269c7f86d056054228 [diff] |
merge in master-release history after reset to 7a9b688fe0bd9ac56ec5b60330ad50c6cb4dd3a8