tree 1625616e8dea88b3bec3bfcf676d748b5de036fb
parent 4c9cfc07ffb385d59be2a2ade38f82f7e0360986
parent c41a3f64e19316cf4bea369d500a7756727c20f9
author Steven Moreland <smoreland@google.com> 1494386304 +0000
committer android-build-merger <android-build-merger@google.com> 1494386304 +0000

Merge "remove "// static" comments" am: 6170b8777e
am: c41a3f64e1

Change-Id: I1ca4397554f2279355765cdac66b2940fd1069f7