merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Thu, 26 Sep 2013 13:01:58 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Thu, 26 Sep 2013 13:01:58 +0000 (06:01 -0700)
commitb548ca800f6f6e853705f431300e70c41aa5efe0
treec3f753b9916f3a9d8812f5519e1cf6a1f89b3609
parent446caf459c690fd06fec850f3dcbedf790753313
parentec24812c789dd09f7905cb1d4618baad216597e3
merge in klp-release history after reset to klp-dev