| commit | f9ae376f63ee31cc230eda12f2911508d2b01adc | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Wed May 07 05:50:22 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Wed May 07 05:50:22 2014 -0700 |
| tree | b3b41970aee0c648377681e5194fd2cbf97afd2d | |
| parent | 4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e [diff] | |
| parent | 5d595a3e6c22654bc65fce5d1cb0e882d185cca4 [diff] |
merge in master-release history after reset to 4522f5749d46adec0189c8dfe7f8e80b9ff4ce7e