| commit | 18fc0f46d6ef4fe3000ddf7928ee19e1e214e2fa | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu May 22 07:22:11 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Thu May 22 07:22:11 2014 -0700 |
| tree | e9c1e4edb66d2210b0c038b2d2390519401b1a6f | |
| parent | 38a3f7de2450fcffd4bd88cc869329f3d17a9996 [diff] | |
| parent | ad0728163ea57a6f0e008bc3516b98bf9120ce9f [diff] |
merge in master-release history after reset to 38a3f7de2450fcffd4bd88cc869329f3d17a9996