tree e973514b4f9e7ce4c819ba681c310b52793db426
parent 2feece06aa9b9190d9d9cf7233a764f13b1faa57
parent 514da60fb6227de9700e145f03614c2081e8e5a5
author Hugo Benichi <hugobenichi@google.com> 1469506094 +0900
committer Hugo Benichi <hugobenichi@google.com> 1469506094 +0900

resolve merge conflicts of 514da60 to nyc-mr1-dev-plus-aosp

Change-Id: Ib1c01241fece36f660d27f3450ba8059b3b2809f