| commit | e204690ae7521726711b3b16f29c5e52a980ebb3 | [log] [tgz] |
|---|---|---|
| author | Nick Vaccaro <nvaccaro@google.com> | Mon Oct 24 13:52:17 2016 -0700 |
| committer | Nick Vaccaro <nvaccaro@google.com> | Mon Oct 24 14:07:35 2016 -0700 |
| tree | 38e4fe79f1702802613795c8b3061967d5751133 | |
| parent | 5115f1c77a51837776ab52a8e86d2583081ba17a [diff] | |
| parent | 7c5aeb0f0ae44b02c3abc72e1daa4151940e1937 [diff] |
resolve merge conflicts of 7c5aeb0 to nyc-mr2-dev-plus-aosp Test: make healthd Change-Id: I6dd20f5da5d2a9858d49db5556d8956a67ebf962