tree 400162adbfc46518ab1cdfbafeb1351ff476f921
parent eebba016de9cae76fa333279835187d6804d6e4f
parent 6fc3c1ad1ad4580044eacd64f65c85182a2a62e8
author Takayuki Hoshi <hoshi@google.com> 1421299496 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1421299499 +0000

Merge "Fix testSyncFiles_extStorageVariable and testSyncFiles_normal" into lmp-sprout-dev