merge in klp-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Mon, 9 Sep 2013 13:01:47 +0000 (06:01 -0700)
committerThe Android Automerger <android-build@google.com>
Mon, 9 Sep 2013 13:01:47 +0000 (06:01 -0700)
commit65d0f4567741f7dc080735f7a19701f1f87e7500
tree9d224ed7c64f23f4f423f67a7c5c59924a4724c4
parenta23d86f400fe029aa05592b963b2c10988545a55
parent46ccf9f192b263456e76dae0c86e36f4fc1ae7f7
merge in klp-release history after reset to klp-dev