am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version."
am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version."

* commit 'b940599a750e3ee50934c57b6a22841627be2d2e':
  Fix bug in passing of context flags and version.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base