| commit | 05292dd65bc11da8c9be2aefda8354049c34052b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 10:09:56 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Sep 13 10:09:56 2013 -0700 |
| tree | cdb0d2eb0a1c7450fa9d5223a7631480ffd9d6c0 | |
| parent | ec4326084ed2a717b3e318f36c2675ef033c30ff [diff] | |
| parent | cc7f0dc5a1806613fc9af4df484a34d8dd4eb06d [diff] |
resolved conflicts for merge of cc7f0dc5 to jb-dev-plus-aosp Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15