tree fff35a4183d9940f7c5031bb6817efa765dce740
parent 2754608bf220e389da50753caa84b70ac68a44fc
parent b33e50868d01a4495d7e070d76c3df18ac01b547
author Dongwon Kang <dwkang@google.com> 1507071371 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1507071371 +0000

Merge "Revive compile options mistakenly dropped by I101334d1a5132"