| commit | 6f99749dd802a82dc83c4847c087ea0420977895 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Tue Apr 22 05:49:46 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Tue Apr 22 05:49:46 2014 -0700 |
| tree | 08fb49483a4768b6ced305302d63ce217d80ecdf | |
| parent | e7ec24c9934c98a451e986a07651992df7fe6558 [diff] | |
| parent | 2ca329db2459a7f584444f3e50eebdecd78f7ab3 [diff] |
merge in master-release history after reset to master