| commit | e7b5c102912f971a820fe07326c0d8956224333b | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 16:17:54 2015 -0700 |
| committer | Mark Salyzyn <salyzyn@google.com> | Tue Jun 02 16:17:54 2015 -0700 |
| tree | 3d51b7b57dd9032d738562ac263711ed9cd54e03 | |
| parent | 6e9805972e0646b2a2ef361d1003b4a6e1a95154 [diff] | |
| parent | 117c3220400bcffce74470ebcf2179d6845cb78b [diff] |
resolved conflicts for merge of 117c3220 to mnc-dev-plus-aosp Change-Id: I6bb3c1e065b51b147fdbc2c3f2e02d8566a06c8f