tree 3154715e4fb4af1a388486d3fc7693c7b1e3b4c8
parent 4e54f930d4dcd297f45507883b9404e1a5ef703b
parent 9e6e5ae243c7aae24b9c059d1d9f56b14f9b0850
author Jason Sams <jsams@google.com> 1348020677 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348020678 -0700

Merge "Fix build.  Missed current.txt in previous checkin." into jb-mr1-dev