| commit | 1c0ff47146f12b9d8142ae9ecf00d844f1fa24c6 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Fri Sep 13 11:43:17 2013 -0700 |
| committer | Xavier Ducrohet <xav@android.com> | Fri Sep 13 11:43:17 2013 -0700 |
| tree | c5ed7ff61021a71489eb36fbfe270a0ab23cb54e | |
| parent | cbcb71c219474be74da89d8b918b7aa3b102fdf6 [diff] | |
| parent | 67a3849081b40624bdfeeb7f77d16afd123a6944 [diff] |
resolved conflicts for merge of 67a38490 to jb-mr2-dev-plus-aosp Change-Id: I0322ae82e67dccd64a0222df0c40eb2fa50fe3b6