tree 510273eadffe25b85a33233d4ecee81565e367f0
parent 15f7d4b327855c684d1ec11f48331642e8dcada1
parent c9daed7a40dbbae4b5fd5b60f32cdca9253644aa
author Scott Kennedy <skennedy@google.com> 1365713905 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365713905 -0700

am c9daed7a: Don\'t do chip resolving in place

* commit 'c9daed7a40dbbae4b5fd5b60f32cdca9253644aa':
  Don't do chip resolving in place