commit | 428c861a8e8aed4aa3224bd8d18211c9e6ca1c64 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Tue Apr 29 15:30:33 2014 -0700 |
committer | Bill Yi <byi@google.com> | Tue Apr 29 15:30:33 2014 -0700 |
tree | cd7be72ffd3bcecd8db2be5f8ef1bc7476598234 | |
parent | 6aac1ccd09d590b014566b4000e7f908cc11e9de [diff] | |
parent | 76f33f0a0864db529cfd47458a0dc331dd1b926f [diff] |
Merge klp-dev-plus-aosp into stage-aosp-master Change-Id: I1c46e9613eb7638531b6abffee43ffc94b116018