| commit | bcaebf02a375211ba9f23140275c9c60ef3315b7 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:49:51 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 15:49:51 2013 -0800 |
| tree | fa4cc701e3ffd5c400d738d3e6a4499269c72466 | |
| parent | dc70a59e96fc6625a52d52adbecf36a019975263 [diff] | |
| parent | 81dec975e49a0bd4b51e7203a6da993252e6cd0a [diff] |
am 81dec975: resolved conflicts for merge of 43730d47 to klp-ub-dev * commit '81dec975e49a0bd4b51e7203a6da993252e6cd0a':