| commit | 55a422a30ffb085ee26d98cab71b785787b8dfae | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Aug 21 13:39:23 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Fri Aug 21 13:39:23 2015 -0700 |
| tree | 9551b8c03d75455fa9509e27a7f5470d7725cb60 | |
| parent | 2fe63c659efac1b9e8c4dea2f5effc8ed718382b [diff] | |
| parent | 6dd63b2358a6017b4561c556b70442e219ce0dc1 [diff] |
resolved conflicts for merge of 6dd63b23 to mnc-dev-plus-aosp Change-Id: I52c5738351ed5cad2fbc64272af4eb47b3417dff