tree aa9f8dcf04d6b946c2c1eaf58fd78d96bf72b2de
parent edebb2fe1d1c4d3ad17db91cd7e2bfe8feafd0b7
parent 1474c7a2b60344c98bec11e91d8479c3a3901249
author Mike Lockwood <lockwood@android.com> 1291310341 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1291310341 -0800

Merge "PTP: Add android.provider.Ptp to the public API"