| commit | 146aa02d90f5cb660ba39d9cc082f4c1818cb7a1 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sat May 10 05:49:27 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Sat May 10 05:49:27 2014 -0700 |
| tree | f7cfc6d113a9af4379046cbd02bf11fab80d9d4c | |
| parent | bd58064a62ecc57056e35c09bc3144f8f44ae4c2 [diff] | |
| parent | cf138c608121e7b3a83d4d93f2e95ae1de6eb243 [diff] |
merge in master-release history after reset to bd58064a62ecc57056e35c09bc3144f8f44ae4c2