| commit | 3125b3e97334eb5dcd6c0981f3dd0a6ab49e44e2 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Wed Jun 03 11:54:49 2015 -0700 |
| committer | Nick Kralevich <nnk@google.com> | Wed Jun 03 11:55:39 2015 -0700 |
| tree | 1c5b67d13e9dc7c6925d416a29486084e2dca085 | |
| parent | 25d9cff48a56c00335d220a87987cc8b39fd2935 [diff] | |
| parent | 94871b94efdb7be54b0bc388c3da02b2058eaf8c [diff] |
resolved conflicts for merge of 94871b94 to mnc-dev-plus-aosp Bug: 19608716 Change-Id: Ic3b44e97fb8731794e5bdaf57db072640cae0737