| commit | 0dd3e8b36a9364dbad1982d65b7a89a443653932 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Mar 18 18:28:37 2014 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Tue Mar 18 18:28:37 2014 -0700 |
| tree | 58a0450c52a437c2ccbda062422776a28feb9971 | |
| parent | 741c662188c53ab43455de87bb0c5d4ca4fffdef [diff] | |
| parent | 37a32c10dcb9f747839c292e0ae1e146831fdf1b [diff] |
resolved conflicts for merge of 37a32c10 to master Change-Id: I388d506d37c9eb8b2e989683eb754b09bf615508