| commit | f1ce3f4f821bd9292d329040d5b7fdc3e33b356c | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Sep 19 06:16:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 19 06:16:41 2014 +0000 |
| tree | 4694666b52007233da46a331156d911f3f5a153d | |
| parent | 63de92749067e3e787fff5924fe7ef871059f156 [diff] | |
| parent | 0a19c517b775ad0e3a66d896dd8a3b01bb476e08 [diff] |
am 0a19c517: resolved conflicts for merge of d9714d34 to lmp-mr1-dev-plus-aosp * commit '0a19c517b775ad0e3a66d896dd8a3b01bb476e08':