| commit | 9185491a5f2733299474d133d76eb6cd053e81d4 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 15:53:48 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 15:53:48 2013 -0800 |
| tree | 7d0eb98a6cca81ca8696c6efd7b8828b0bd2c4a5 | |
| parent | 61106ec59e18be5607959a8a0abc72322cbdfc15 [diff] | |
| parent | bcaebf02a375211ba9f23140275c9c60ef3315b7 [diff] |
am bcaebf02: am 81dec975: resolved conflicts for merge of 43730d47 to klp-ub-dev * commit 'bcaebf02a375211ba9f23140275c9c60ef3315b7':