commit | 94f5ed856215fa061a8282fa568cabffb9b4227d | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Mon May 19 05:49:37 2014 -0700 |
committer | The Android Automerger <android-build@google.com> | Mon May 19 05:49:37 2014 -0700 |
tree | 002ff27796ef761c847078c7f05e34ce8d699310 | |
parent | 2079d768f79f636223d89b988a30209adf8dddbe [diff] | |
parent | 06f9966b4922aa8f6e316b203d73c8347658cc29 [diff] |
merge in master-release history after reset to 2079d768f79f636223d89b988a30209adf8dddbe