tree b0a348765b4e94f4ffef2facefcba9473be74c6b
parent 40971709baf81e79e76ee794a1723b322577e8e6
parent 8b32fe246cb944ddf80331d5be8aaa2c46c93260
author Jae Seo <jaeseo@google.com> 1462924109 +0000
committer android-build-merger <android-build-merger@google.com> 1462924109 +0000

Merge "Merge "TIF: Fix comments for program start/end times" into nyc-dev am: 281d96e238 am: 39f306f886" into nyc-mr1-dev-plus-aosp
am: 8b32fe246c

* commit '8b32fe246cb944ddf80331d5be8aaa2c46c93260':

Change-Id: I43c75f759fc904bf73ec567572f0318b8d7bcbef