tree e81614a7a604616a0fff892f26b1f316664cec26
parent fb516c2e635677cf7f7ad8c0eee27329b245cc54
parent 0f5d443d0ccc3d3d95604b241cdd23117363f849
author James Hawkins <jhawkins@google.com> 1455909030 -0800
committer James Hawkins <jhawkins@google.com> 1455909030 -0800

resolve merge conflicts of 0f5d443d0c to nyc-dev-plus-aosp

Change-Id: I850bda0808ae17ade5bc0e667211a599d284d6e3