tree 3b06c34eebb1741642dda0f3eb6e8b0caee6c520
parent d7c6ac024c02da60ae3c53cd8af3fe4fe57982b5
parent e012de57182f835b299dc0ea74b5f362609d5b63
author Josh Gao <jmgao@google.com> 1470373445 -0700
committer Josh Gao <jmgao@google.com> 1470373445 -0700

resolve merge conflicts of e012de5 to stage-aosp-master

Change-Id: I3d9f8b4421fa6122261dbd821561a2236f810a47