OSDN Git Service

Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev
authorAdam Lesinski <adamlesinski@google.com>
Sat, 8 Nov 2014 02:30:31 +0000 (02:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 8 Nov 2014 02:30:31 +0000 (02:30 +0000)
commitb94de814479749818e30dace03c70697485c7809
tree5c64315d6f9d6d31da02bb19fb0a468cbb3823b2
parent6e2e4b7343eeae8ac8439bcf6bf3678609b4a230
parent96f635ed5b30507b2a6d72c2547d4784fe53ac3d
Merge "UsageStatsService: Update file index to prevent double checkin" into lmp-mr1-dev
automerge: 96f635e

* commit '96f635ed5b30507b2a6d72c2547d4784fe53ac3d':
  UsageStatsService: Update file index to prevent double checkin