tree 4457547077c5881408a94c6cd2b1c6ea5a5a3e20
parent 888de830edd037118e9f3a864e5930f2c7defa3c
parent fa6a1bc755e592ca649e0428f0866289d91df1ea
author Jeff Sharkey <jsharkey@google.com> 1456879119 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1456879121 +0000

Merge "Sometimes to step forward, we need to go back. [2/2]" into nyc-dev