| commit | 24971ebb2ee0d320a73f8fa2c4d75cdf74175b21 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed May 21 05:50:20 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed May 21 05:50:20 2014 -0700 |
| tree | ca0e5d7f03ad7a06496c89c432220d5f08c0d80e | |
| parent | c31e3883456e018d742e9f29815ba5ff8b315ea1 [diff] | |
| parent | edb291fbf2ec6bd1a79f57591fdcce3f3077c7d1 [diff] |
merge in master-release history after reset to c31e3883456e018d742e9f29815ba5ff8b315ea1