| commit | 037f27e3b88830fdef6871c7d3a0121915b12e56 | [log] [tgz] |
|---|---|---|
| author | Andrew Lee <anwlee@google.com> | Tue Jun 02 14:05:14 2015 -0700 |
| committer | Andrew Lee <anwlee@google.com> | Tue Jun 02 14:05:14 2015 -0700 |
| tree | 3ac2b0a49de9784ae9242b1188c18d0cfa680e7e | |
| parent | c8c2dec0708bad491f736560d9ef6b8d5aa6ff32 [diff] | |
| parent | 9c9958ca6c51676cab549d19311df59a1b4ccf1a [diff] |
resolved conflicts for merge of 9c9958ca to mnc-dev-plus-aosp Change-Id: Id3203fa190b351074a56195b8dfea4f6cee9a767