Fix build.
authorWink Saville <wink@google.com>
Thu, 3 Oct 2013 23:42:08 +0000 (16:42 -0700)
committerWink Saville <wink@google.com>
Thu, 3 Oct 2013 23:42:08 +0000 (16:42 -0700)
commitef3149f4e736344e55f0fc8ceb419edf66119969
tree7a79823e48489bbee625a29525c9f1489c1a8849
parent1b8d3498dde73d31c8d6e48050b6240164a8fcc1
Fix build.

The merge conflicts I'd resolved internally got overwritten when pushed
up the other changes.

Change-Id: I6a3cd569e6cf1a0fb09a19379d65724d43c11bdf
src/java/com/android/internal/telephony/dataconnection/DcTracker.java