commit | 4b6a4484f054de8885aa9616c5155080e64ffcd7 | [log] [tgz] |
---|---|---|
author | Ed Heyl <edheyl@google.com> | Fri Dec 06 16:11:39 2013 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 06 16:11:39 2013 +0000 |
tree | d48d195c320ebd60b898447f1c5dc8cd4509d233 | |
parent | 415910d51b2de0f6ece82f835787a43954f981eb [diff] | |
parent | 92029a62a818cab0c5829066971ca67f4845bd57 [diff] |
am 92029a62: am 0b3d7b9d: am 47be3b30: merge in klp-release (no-op) * commit '92029a62a818cab0c5829066971ca67f4845bd57':