tree e5d0c2f0bdb5c230a3a1db31362e60208cd09ccb
parent 158867849c8a55d1db95ead7cbeca4aacd47350f
parent f124de09482eb53fa7a652cb8fe217c01aea46f4
author Shinichiro Hamaji <hamaji@google.com> 1458163820 +0900
committer Shinichiro Hamaji <hamaji@google.com> 1458163831 +0900

Merge remote-tracking branch 'aosp/upstream'

There was a regression in the previous merge.

f124de0 Put a whitespace for subshell before a close paren
ce7a2b4 Add a whitespace after an open paren for subshell

Change-Id: Id14d00bc0549e37a8c0e0b8990753b4f74f3a538