tree f47d40da365fe0c1cf1732b2109219fb1fc25276
parent af63ca3b3f2992c0561f0a678fe0f44bde3e47dc
parent b2a5b5286d801081c28e6a76ff143ac1c5448f87
author Chris Banes <chrisbanes@google.com> 1480614185 +0000
committer Chris Banes <chrisbanes@google.com> 1480614297 +0000

resolve merge conflicts of b2a5b52 to master

Test: it compiled

Change-Id: Ic0eda73baf40dd342858b464f554bc4527177e85