tree cf5844135f19920c3e6611700e2b5c8d435df12c
parent 2bd4f7a892e22d41f4055027c7f0b21b3b4db03b
parent 0a4327e6bfeedc23ddefb4df9f6e8041ebc87b59
author Andrew Lee <anwlee@google.com> 1402507609 -0700
committer Andrew Lee <anwlee@google.com> 1402507609 -0700

resolved conflicts for merge of 0a4327e6 to master

Change-Id: I98b24e23d9d3283223f8db0c58930977b7a8fd35