merge in klp-mr1-release history after reset to klp-dev
authorThe Android Automerger <android-build@google.com>
Wed, 6 Nov 2013 14:00:54 +0000 (06:00 -0800)
committerThe Android Automerger <android-build@google.com>
Wed, 6 Nov 2013 14:00:54 +0000 (06:00 -0800)
commit52fa204952fa9b041d614e2bba5568362f79eb36
tree299cd5636d76635d9ba42d7fe3db8c2914ae6eb9
parenta500ee7fd60949cc1f5646442a95c4c4edc721c4
parentcfd8384fe6419bdd177a109676db8edf8bf49ed6
merge in klp-mr1-release history after reset to klp-dev