Commit 711bd67c authored by Yuichi Araki's avatar Yuichi Araki Committed by android-build-merger
Browse files

Merge changes Id24d3147,Iac2c95f3 into oc-dev 

am: 74c7cd6e

Change-Id: I168a5be098b2bb327f52389bd368f3d6dc7e1b41
parents 7b74bcf3 74c7cd6e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment