commit | 0aa10a3ef5031d52f118f46b772ed50b93b6ba26 | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Wed Apr 30 05:49:03 2014 -0700 |
committer | The Android Automerger <android-build@google.com> | Wed Apr 30 05:49:03 2014 -0700 |
tree | bf341efc176fe5e0c3d0a10d122670f2b23ebd72 | |
parent | 841568006407d35de16f4641c3da65c1ee1eb688 [diff] | |
parent | d92a30a85bcf8727427f05cd1f26f3f4cfb08f76 [diff] |
merge in master-release history after reset to 841568006407d35de16f4641c3da65c1ee1eb688