| commit | 5abefbb8d6e2a4bfe824d9c2d8904600d41f9387 | [log] [tgz] |
|---|---|---|
| author | Jatin Matani <jatinm@google.com> | Sat Jul 11 01:08:28 2015 -0700 |
| committer | Jatin Matani <jatinm@google.com> | Sat Jul 11 01:08:28 2015 -0700 |
| tree | 1c344e3a6deefc5bf4fd3fcc7a504f7b1491c5f8 | |
| parent | 1791ce07522f938a349eedeb22223449abe6c380 [diff] | |
| parent | 9cd60fe1bb67cec755c1cee6d541272e64129072 [diff] |
resolved conflicts for merge of 9cd60fe1 to mnc-dev-plus-aosp Change-Id: I1aad861d711170ab3dab0019d8e4ff02f058c423