am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT...
authorWink Saville <wink@google.com>
Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Oct 2013 00:10:54 +0000 (17:10 -0700)
commitdf87bf5ff4929499d17a1a51995d95aded0f2a27
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parent13f55c54f7e5959d53daad8dbc708fc77032f34f
parent7351fdfb5b61da990f72cdc18dead250a9e5379c
am 7351fdfb: (-s ours) am 1b8d3498: Hipri should not be enabled by default. DO NOT MERGE.

* commit '7351fdfb5b61da990f72cdc18dead250a9e5379c':
  Hipri should not be enabled by default. DO NOT MERGE.