| commit | a9d7ce4e5ba4ed2397956722dc228c33aa97ef19 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jul 25 16:32:35 2013 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Thu Jul 25 16:32:35 2013 -0700 |
| tree | ed9a29d75f9244994dcaae9410a3d8a9302cd5ab | |
| parent | 7def7e7e0d03d55db2ed823ef4f4eabcb8fd9164 [diff] | |
| parent | e4e1580738f019d2373f8a4b9ba08c2933f2c306 [diff] |
resolved conflicts for merge of e4e15807 to master Change-Id: I42fbf1123933e40c51dcbc1ff2eaa456ec68b0e7