tree ce133fda053a45fa0971d0990d85b9afe10c293b
parent 3655a7dd98033b0f13baeca0346c7b03f2c0c81e
parent 7520e492e75a517b7ff41452318dd56bb9a74c8c
author Hyunyoung Song <hyunyoungs@google.com> 1461198053 -0700
committer Hyunyoung Song <hyunyoungs@google.com> 1461198053 -0700

resolve merge conflicts of 7520e49 to nyc-dev-plus-aosp

Change-Id: I7e619acb70767f5db5004a40e160ef6487aea78b