| commit | 984bd8323dcb5e494a04b2058ab7de40bf347ee5 | [log] [tgz] |
|---|---|---|
| author | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| committer | Tom Cherry <tomcherry@google.com> | Mon Sep 21 14:25:34 2015 -0700 |
| tree | 7a7f03f6b56aa2c8482d87ca2aeac5f87e73df88 | |
| parent | 03581ce1eadfe03a13060fc478d876f46735be81 [diff] | |
| parent | 5caca3dd89801b691d271586cdb73497ef93b529 [diff] |
resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0