| commit | dc63495cbab63837c2d59d79b322f944616746d2 | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Tue Nov 05 16:10:05 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 05 16:10:05 2013 -0800 |
| tree | fa4cc701e3ffd5c400d738d3e6a4499269c72466 | |
| parent | bcaebf02a375211ba9f23140275c9c60ef3315b7 [diff] | |
| parent | 1bf478743eeb0d33721f0f5bede004070a5bc70d [diff] |
am 1bf47874: resolved conflicts for merge of 559a00ad to klp-ub-dev * commit '1bf478743eeb0d33721f0f5bede004070a5bc70d':