tree 102a135a8bfcc96b38e8a3bcf62c7e5b8c985738
parent d75e17258586c090493385f18c5be895a2fc8783
parent a76b0004c285d33ffb5aca66e86850be3bc73037
author The Android Automerger <android-build@google.com> 1424138481 -0800
committer The Android Automerger <android-build@google.com> 1424138481 -0800

merge in lmp-mr1-release history after reset to lmp-mr1-dev