| commit | 2aa9f1f9c84b22bff7d481bd6fc3d82ce9d64d32 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Dec 05 22:44:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:44:40 2013 +0000 |
| tree | adb64c650885008a1b21eaedbeb3b9fc778f44aa | |
| parent | b21b50a9c8a182774c841347912624091110f3d3 [diff] | |
| parent | 7a9ec2cd8d00c906603c5cb88625c97b47378947 [diff] |
am 7a9ec2cd: (-s ours) am afa1231e: am b6da9115: Merge "Remove incorrect warning." into klp-dev * commit '7a9ec2cd8d00c906603c5cb88625c97b47378947':