tree d5956c17e6caa699d1494e120ecdb73af3b84efd
parent 1dd6936a862be97efca02e4b7582a9fca1fcc269
parent 2bfe11af6f715656b60fc9ac4566e74da9b98390
author Android (Google) Code Review <android-gerrit@google.com> 1248802076 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1248802076 -0700

Merge change 8806 into donut

* changes:
  Mark the the airplane mode internal strings as not translatable.