tree 3759093e0169c5ad63420e1ea53969fa4a424130
parent 0694bfce1fc1ca3b0f534deafa364038b71a7115
parent b938cbc7a7c0d98892e6268c45823861c05217fd
author Elliott Hughes <enh@google.com> 1452016226 +0000
committer android-build-merger <android-build-merger@google.com> 1452016226 +0000

Merge "Clean up Mac OS hacks in acp slightly." am: 0e80edd259
am: b938cbc7a7

* commit 'b938cbc7a7c0d98892e6268c45823861c05217fd':
  Clean up Mac OS hacks in acp slightly.