merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 8 Jan 2015 17:33:11 +0000 (09:33 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 8 Jan 2015 17:33:11 +0000 (09:33 -0800)
commit0e017699e1dd0539e2c0f0ad5bf7a3cb134c701b
tree00603b8f036884e57b5acebf7dfd7821951445be
parent29a60df69e0caa0800bc7cf848b00b719019bb6c
parent2fa9c67b1a7439aa7ee7cb53c83f9a09674dccf6
merge in lmp-mr1-release history after reset to lmp-mr1-dev