tree 0e3cb03df8d8c8ee6313c2ff677a369cf3822025
parent fc6c49bdda8d5d6a6cddedba9a1908bc2a58d2c1
parent aa09cd8dc20c9134b69ace4a7b84fe0103220fb4
author Brian Carlstrom <bdc@google.com> 1307679112 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1307679112 -0700

Merge "Tracking KeyChain API refinements"