| commit | 44fecfc1985ccba88cb99a86c9b5a3aa9c677ab1 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Fri Oct 31 00:23:40 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 31 00:23:41 2014 +0000 |
| tree | b8566973a667dbff9d461aa42fc439e3a3d345e1 | |
| parent | b2e752fd3688aeb932fe6c36fef942c7111a3346 [diff] | |
| parent | e1477b39704dc7c022a44371d0cb9d9061780bf8 [diff] |
Merge "resolved conflicts for merge of 62a09752 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp