| commit | 35dfaa27720db341c3b3ecd0425bb733d5cd22b4 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 16:12:19 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 16:12:19 2013 -0800 |
| tree | 7d0eb98a6cca81ca8696c6efd7b8828b0bd2c4a5 | |
| parent | 9185491a5f2733299474d133d76eb6cd053e81d4 [diff] | |
| parent | dc63495cbab63837c2d59d79b322f944616746d2 [diff] |
am dc63495c: am 1bf47874: resolved conflicts for merge of 559a00ad to klp-ub-dev * commit 'dc63495cbab63837c2d59d79b322f944616746d2':