tree 01eafe7fe2e5620b8f0f4ebcd3493c1621b1f032
parent d99db031ea0ff1fe93c924573f70eae8cd6f8edb
parent 69822632560413bd1abfc7e3b35307fcef2739ad
author Tsuwei Chen <tsuwei@google.com> 1411705787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411705787 +0000

am df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'df9e62f058e6e8f9a5853460d9c916fe5dfae751':
  Fix an incorrect behavior that failed AT&T privacy test.