am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev automerge: 2eaf0b0
am a27afde3: Merge "Fix typo in activity_testing.jd" into lmp-mr1-dev
automerge: 2eaf0b0

* commit '2eaf0b0a7b86304a739f91033e9f8f053123e74d':
  Fix typo in activity_testing.jd

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