| commit | 8f0356d8202a24af65459b1f0e9c9b60822957a3 | [log] [tgz] |
|---|---|---|
| author | Ihab Awad <ihab@google.com> | Wed Oct 01 21:34:44 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 01 21:34:45 2014 +0000 |
| tree | 4b2dca2d4b1d9ce45769452d759eabf4ce1b5333 | |
| parent | 2298938cef8d5aa2211ef08e27553354918e5554 [diff] | |
| parent | 12a4df2b66fccbc1e4293e8f56217e1064b2e8ea [diff] |
Merge "resolved conflicts for merge of ead63f02 to lmp-mr1-dev" into lmp-mr1-dev