| commit | 3843c14979dce08cc6f800fa9964bf2f8a4bbb2c | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Jan 31 09:38:20 2014 -0800 |
| committer | Colin Cross <ccross@android.com> | Fri Jan 31 09:38:20 2014 -0800 |
| tree | 775c15e8c34be200e946a470c7430bb0420e3771 | |
| parent | ee2bba62529ce544a60d141ca10a37407c03ab1e [diff] | |
| parent | 74da04349d74ae63f68da6fab560025714209743 [diff] |
resolved conflicts for merge of 74da0434 to master Change-Id: I0a7745ecf65a2188c32e7bf2e89fe93259c71b83