| commit | 7d323cf812c630dc15c35f46967d7c1c7115d831 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu May 15 05:49:36 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Thu May 15 05:49:36 2014 -0700 |
| tree | 5922c3afca912e375b48e0fbb9c5f00183f57170 | |
| parent | 2f485f29e823e418ec160416ff425e8a015cae80 [diff] | |
| parent | b55be89348c9b6789835904ff16b4a56cd77a704 [diff] |
merge in master-release history after reset to 2f485f29e823e418ec160416ff425e8a015cae80