| commit | 2a5d2e98f9ffbddf37d8d57ed3028c3c8349e351 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 08 18:10:55 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 18:10:55 2013 -0700 |
| tree | 032a162a2248b2fc0be232afc9b9666747a1e5dd | |
| parent | 598f3e9c4a48a4f4cbae6fb163f378d9fd1e6321 [diff] | |
| parent | 9e9d1e016faf12c4bc5454ce16e20f7db693a72d [diff] |
am 9e9d1e01: resolved conflicts for merge of 86125aca to klp-dev * commit '9e9d1e016faf12c4bc5454ce16e20f7db693a72d':