| commit | 6f7e621d9c2c56bbdfa9d3f3073431eb6e3434e9 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu May 22 05:50:41 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Thu May 22 05:50:41 2014 -0700 |
| tree | a054ebeb4f0eab6c785e8a1664ecafbc544c2f8d | |
| parent | 60e4ab06acb240bb910bab5f2a4bf64de2bced56 [diff] | |
| parent | fbb46d1a3df75fe22c2130853bad58ed6a414437 [diff] |
merge in master-release history after reset to 60e4ab06acb240bb910bab5f2a4bf64de2bced56