tree 4da3523034492e52e422a4af8b1e3e83147a6c7b
parent ffd0655860191a21800b83b56f0e0d628e8e0186
parent aa96e5533389cf3d1cca866f2fb0d949245031a1
author Jerome Gaillard <jgaillard@google.com> 1485966926 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1485966927 +0000

Merge "Fix sdk build following Change I4c9763ab"