| commit | 8a4ae0a873862ea0a4764cd3492467843485f1e5 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Apr 05 13:46:55 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Apr 05 13:46:55 2013 -0700 |
| tree | 34e9edd1e250480a0edac9bd8ef4e05e4f6b3a35 | |
| parent | c307aa5f038cea2a0fb5bb535f5930758bdfbb81 [diff] | |
| parent | f79c05186fb48c89bc6036a751cbe455b99028cb [diff] |
resolved conflicts for merge of f79c0518 to jb-mr2-dev-plus-aosp Change-Id: I106a2aa7ec393a68e51132bf277b22bece155a8e