commit | 331baaa05ee8e897df328f782a5d59f478679a64 | [log] [tgz] |
---|---|---|
author | The Android Automerger <android-build@google.com> | Wed Jan 06 01:15:11 2016 -0800 |
committer | The Android Automerger <android-build@google.com> | Wed Jan 06 01:15:11 2016 -0800 |
tree | 1f276752964ad9c5298b989b479bb62e4007c414 | |
parent | c4d26d10b391ec6ba9ff1ec65cef8ade7788bcd0 [diff] | |
parent | 4b3c0398f6e460b36b210623fbc25f676e2fbc02 [diff] |
merge in emerald-release history after reset to emerald-dev