Merge klp-dev-plus-aosp into stage-aosp-master

Change-Id: I2790b6a42d674678713d01479287b78510c4bb52
This commit is contained in:
Bill Yi 2014-04-29 15:27:33 -07:00
commit 7af263533d

Diff Content Not Available