commit | 7e0846c35f5e15749969f33375e36ec0de7e25a8 | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Wed Oct 16 18:01:57 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 16 18:01:57 2013 -0700 |
tree | dca17c02d996a0175f5ebbd0d969dd8ae747f185 | |
parent | d8add7d3b713ec460815552a522e13f7350eb8c9 [diff] | |
parent | 6ddd2009ce3593e3df4bc4b5ce739210e68ccbac [diff] |
am 6ddd2009: am 587fa0b4: am 565caebc: merge in klp-release (no-op) * commit '6ddd2009ce3593e3df4bc4b5ce739210e68ccbac':