am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for...
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)
commit13f55c54f7e5959d53daad8dbc708fc77032f34f
treef901d7966b7259ab3caaee4eeb95967c3521d75d
parent5cae974f106dcd8fe84023afd9c4b1ffb7df3c52
parente3e070ec720cceb3f12d9c720e42519797aff583
am e3e070ec: (-s ours) am 59986fee: Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.

* commit 'e3e070ec720cceb3f12d9c720e42519797aff583':
  Remap NONE to UNKNOWN on GENERIC_FAILURES for SETUP_DATA_CALL. DO NOT MERGE.