tree 81f30d073223e1af93bf63d6fba2ed5fcae4035c
parent 4131f89cdcdb1326ab8b7c73c268139531cd0b18
parent 7dfd2ba2d6d281be7b5571ad437eba951a422e54
author Tom Cherry <tomcherry@google.com> 1499821281 +0000
committer android-build-merger <android-build-merger@google.com> 1499821281 +0000

Merge "remove extraneous `using namespace android`" am: 8e661076b6 am: b765fc92bb
am: 7dfd2ba2d6

Change-Id: If53e428ad2e3ebd2c6df0468716eb30e27a83fe2