commit 74089a0946fa804e13497931a1c15e94a445f6ad
author Baligh Uddin <baligh@google.com> Fri Mar 22 04:59:59 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 22 04:59:59 2013 +0000
tree ad575c85d0b3ddc9d40ade0e5b72af0f1e5c964b
parent 0849a4b9b7dc4e37993ca59cab1db8b43f0d456c
parent ba0e497a0c53ae2a64c070544f6a6f0495442343

am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev

* commit 'ba0e497a0c53ae2a64c070544f6a6f0495442343': (126 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Support feedback
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [FileEncap9] Extract ResearchLogDirectory class
  [Lazy2] Pass a runnable to abort
  [Lazy1] Switch to blocking log closures
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [Lazy4] Remove useless debug code
  [FileEncap8] Remove useless "success" variable
  [FileEncap7] Extract uploadContents method
  [FileEncap6] Extract Uploader class
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  [FileEncap5] Move conditional logic to caller
  [FileEncap4] Simplify logic
  [FileEncap3] Extract isUploadingUnconditionally method
  ...