merge in lmp-release history after reset to lmp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 2 Oct 2014 12:27:22 +0000 (05:27 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 2 Oct 2014 12:27:22 +0000 (05:27 -0700)
commitbfc1271b6a2cd70c8563f603d24b810f0424d341
treec1e5d4034c75fe26add8e65ff9bccbadbad40e61
parent38aacb31e230f7b8b6dbd3865cc1c84bbaf2ee65
parentf8ffae6791e292fe370f2286d7e374e5250e48dd
merge in lmp-release history after reset to lmp-dev