| commit | c5c2e53779c2c2b6d889bdad5d11d47da9e72789 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Wed Nov 26 14:48:45 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Nov 26 14:48:47 2014 +0000 |
| tree | 6c29eb8aadb82f7fa632fd0e9a817cd4772a89e8 | |
| parent | 57086523d593e04db69e5ed75987c669b809176b [diff] | |
| parent | d9b91d0d497031a0c46d06678e2f4f050e52be73 [diff] |
Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev