| commit | 77ccfd59d42167e0a0496c09aec282c1f66beb21 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Thu Dec 05 22:28:06 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:28:06 2013 +0000 |
| tree | 8368c2dafa4858f870ed7ed5e3e892f614ad87c5 | |
| parent | 11833f38674947e1dddb12537782d78b42b0cd90 [diff] | |
| parent | 5e667cc092b51bf91ee9f6562dc824a2c753d1e6 [diff] |
am 5e667cc0: (-s ours) merge in KQS81M * commit '5e667cc092b51bf91ee9f6562dc824a2c753d1e6':