| commit | b1df25776b7cce22d2cee2ee5722cfb32d5fbac3 | [log] [tgz] |
|---|---|---|
| author | Matt Sarett <msarett@google.com> | Mon Aug 24 10:48:34 2015 -0400 |
| committer | Matt Sarett <msarett@google.com> | Mon Aug 24 10:48:34 2015 -0400 |
| tree | 1c334f11e06ab22e7328a63305f294d5b1ebf6a6 | |
| parent | 9b8f8602a74a943ddc356bb11c55b4998b2b386d [diff] | |
| parent | ab10e256df4f684260ca239905b1cec727181f6c [diff] |
resolved conflicts for merge of ab10e256 to mnc-dev-plus-aosp Change-Id: I142850c4dbdab8a656c9bc32b71d72bc6362fed7