| commit | fb2d225bc843642b6fbed10fe8ce7e17a8a396c6 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Thu May 22 05:49:24 2014 -0700 |
| committer | The Android Automerger <android-build@google.com> | Thu May 22 05:49:24 2014 -0700 |
| tree | fa135ea0cf618bbe5582de0e9f9eabb499c2f854 | |
| parent | 486396a8c9f36373987e181b5c7a31e78356c520 [diff] | |
| parent | f584321edc614c055b3b99bcca663b3015ccc193 [diff] |
merge in master-release history after reset to 486396a8c9f36373987e181b5c7a31e78356c520