tree f82a2b96bcea58e9e66de6242e82007fa889da88
parent 5038b92e6adae454feb6095092bdaff80ecf1db3
parent 91bb9d0a8489068c88d9d2496d9e806cf4094df3
author Roozbeh Pournader <roozbeh@google.com> 1437425817 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437425817 +0000

am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit '91bb9d0a8489068c88d9d2496d9e806cf4094df3':
  Bidi-wrap the results of format[Short]FileSize().