| commit | 7d0c6de5022c2202e368206b320519383044c608 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Tue Apr 29 05:49:31 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Tue Apr 29 05:49:31 2014 -0700 |
| tree | d16a8a13cba28102070b96508f0ee95becdfe93e | |
| parent | 04c85ceee7b3955fbbb8ba1e438541ade88e7279 [diff] | |
| parent | 59b80c2e8d299349ba972337270883e96abb7197 [diff] |
merge in master-release history after reset to 04c85ceee7b3955fbbb8ba1e438541ade88e7279