merge in klp-mr1-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Tue, 5 Nov 2013 14:04:10 +0000 (06:04 -0800)
committerThe Android Automerger <android-build@google.com>
Tue, 5 Nov 2013 14:04:10 +0000 (06:04 -0800)
commitcfd8384fe6419bdd177a109676db8edf8bf49ed6
tree8bfa01934c44fcd05196db0a5aec4fd337b6a43f
parent8409d93cf9f3ed23db12f24b4f49063ea416b30b
parent3ba048e25c35806cfeca3a5419565e64c9c5deef
merge in klp-mr1-release history after reset to klp-dev