resolve merge conflicts of b81edb4 to master am: ce5292f584 am: 49ddc6319b
authorDavid Sodman <dsodman@google.com>
Thu, 22 Dec 2016 05:36:44 +0000 (05:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 05:36:44 +0000 (05:36 +0000)
commit8122cc866a0555d673ffb2092129ac45e853d0e1
treed41e16edfed075ce01e1f5a2cdb9f408e4759fde
parent3d24f19c31376eedc4adbd7cfb4c4902bc314b17
parentf07ca045e6626ed673e3a9d6bbc15e69a49955c4
resolve merge conflicts of b81edb4 to master am: ce5292f584 am: 49ddc6319b
am: f07ca045e6

Change-Id: Idd11105e84a891d593e318c1a267bc4763f7a8ca