| commit | 5f010e1a8df6eba27615c8e2d1c0c82cf0c48682 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Thu Dec 05 22:28:05 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 22:28:05 2013 +0000 |
| tree | 3db4a61e3e37901d5449fa76a62825e049f15d6c | |
| parent | 23c52f484509231e67179a33fc8f469cd178cab6 [diff] | |
| parent | 40619e77f138d6912ca641e0f449ecaaab35f595 [diff] |
am 40619e77: (-s ours) merge in KQS81M * commit '40619e77f138d6912ca641e0f449ecaaab35f595':