am 58be8804: Merge "Fix build error while were doing incremental build"
Wink Saville [Thu, 20 Dec 2012 21:47:03 +0000 (13:47 -0800)]
* commit '58be8804124094488dc6727223f309e2e1aaf223':
  Fix build error while were doing incremental build


Trivial merge