| commit | 087cd35b79151978e0f119af32748fbce02564be | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Aug 03 14:19:35 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Aug 03 14:19:35 2015 -0700 |
| tree | 97ed6b33ee2aa6adac00ea7496536d6785abbc88 | |
| parent | fd41e5e5d97dc878836a01196810271d87256d16 [diff] | |
| parent | 0070026c1b87facf626042e8ba1e36877129af76 [diff] |
resolved conflicts for merge of 0070026c to mnc-dr-dev-plus-aosp Change-Id: Ibc802572898b6913c1f5d94aaae19974bfc0eb85