| commit | f95684adf915284ea2f5b84299b5ff1c40662f21 | [log] [tgz] |
|---|---|---|
| author | Ye Wen <ywen@google.com> | Tue Nov 25 10:36:42 2014 -0800 |
| committer | Ye Wen <ywen@google.com> | Tue Nov 25 10:36:42 2014 -0800 |
| tree | b707d4b913ef00a3f84e3125b529df38909aed1c | |
| parent | 132ee4ee49c5966ff88ed45c33ad9916b40215b7 [diff] | |
| parent | 3c1568d10c668f6efeed075e8e3a9c681aabde57 [diff] |
resolved conflicts for merge of 3c1568d1 to lmp-mr1-dev-plus-aosp