tree f1fe680a781cb7d5d8f9e355b91cb7bd250ca7ef
parent f751b01146d81fd70645907f5fd3a4cc3a7acc02
parent 5f9c140d094ebf4a269cdc6ae083900bf25f7fae
author Matthew Xie <mattx@google.com> 1376465441 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1376465442 +0000

Merge "LE: Add instance ID to descriptors (2/4)" into klp-dev