| commit | dc60db4c950de4e28a8f8af04fc770805c5563e1 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 00:59:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 00:59:36 2014 +0000 |
| tree | 2dbb05e45f4a5eea661a6eeacb03f28c85efb5db | |
| parent | fbc1ca4c38c24b514e0a00d072c7b11cb6c913e1 [diff] | |
| parent | f4748e79ccdc8c6f10a5903791cd253bc084a6ef [diff] |
am d968d1a2: Merge klp-dev-plus-aosp into stage-aosp-master * commit 'd968d1a28dae45229b1be9f05bef8df13821e94d':