| commit | 1150078a371c5114cb1e4a9a723bbeba0ad956af | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Tue Apr 15 05:49:25 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Tue Apr 15 05:49:25 2014 -0700 |
| tree | 3b7f5822b40fae3081c80b02d13f5eb611e31e9a | |
| parent | f46308ba8c20c955062a61533f607e8a72d6e7f8 [diff] | |
| parent | 81e798aaa2a5efb390c67ba4aaac4270dfe604a9 [diff] |
merge in master-release history after reset to master