merge in lmp-mr1-release history after reset to lmp-mr1-dev
authorThe Android Automerger <android-build@google.com>
Thu, 29 Jan 2015 14:10:36 +0000 (06:10 -0800)
committerThe Android Automerger <android-build@google.com>
Thu, 29 Jan 2015 14:10:36 +0000 (06:10 -0800)
commit9ba3d035310b7936cf048db79bc273f096c95b9b
tree16550c644702a55ee4a2e4bfd94bde5ea80a80ea
parent25ffbfe5e8b51f392fafc1bffb16b6633a8ba3df
parent5a1fc68210aaee9bdea204b1b2041617df36966a
merge in lmp-mr1-release history after reset to lmp-mr1-dev