Skip to content
Commit 5b32ea3d authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge changes I36ec1bf3,Ic5f11074 into oc-mr1-dev 

am: 54f40fa1

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da
parents 2a43dcbc 54f40fa1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment