| commit | b3c838208e1349d9ba896ac45533cab8c16e69c9 | [log] [tgz] |
|---|---|---|
| author | Alexander Lucas <alexlucas@google.com> | Tue May 13 15:19:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 13 15:19:10 2014 +0000 |
| tree | d593cb34b8e2adbe2c14ae99554c7d5824f3cbed | |
| parent | 7f88717b98dc11039ed8b28121eebd9b9ecbc30b [diff] | |
| parent | c98496f27a71f082b66b8c62bae8610fb3415410 [diff] |
am c98496f2: am dfc9958f: am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev * commit 'c98496f27a71f082b66b8c62bae8610fb3415410':