diff options
| author | Trevor Johns <trevorjohns@google.com> | 2014-10-15 21:16:16 -0700 |
|---|---|---|
| committer | Trevor Johns <trevorjohns@google.com> | 2014-10-15 21:16:16 -0700 |
| commit | d991bed6f11b830616a967fde54f8d4f1e86eef0 (patch) | |
| tree | 19dec6d3a2036b17538caf32aaa4c6a88155bd89 /build | |
| parent | 569e9febc5c91d92459579e32df7b948d3e32dff (diff) | |
| parent | 9875ec66e188cbcced9d4cc3334af7846b809587 (diff) | |
Resolved conflicts for merge of '9875ec66' into lmp-dev
Conflicts:
build/sdk.atree
Change-Id: Ie195fc75425ccb4ad36e3267627ae66619380505
Diffstat (limited to 'build')
| -rw-r--r-- | build/sdk.atree | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/build/sdk.atree b/build/sdk.atree index 0cab31ffb..ef65ec407 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -274,6 +274,8 @@ developers/build/prebuilts/gradle/SwipeRefreshLayoutBasic sam developers/build/prebuilts/gradle/SwipeRefreshListFragment samples/${PLATFORM_NAME}/ui/SwipeRefreshListFragment developers/build/prebuilts/gradle/SwipeRefreshMultipleViews samples/${PLATFORM_NAME}/ui/SwipeRefreshMultipleViews developers/build/prebuilts/gradle/MediaRouter samples/${PLATFORM_NAME}/media/MediaRouter +developers/build/prebuilts/gradle/BluetoothChat samples/${PLATFORM_NAME}/connectivity/bluetooth/BluetoothChat +developers/build/prebuilts/gradle/MediaEffects samples/${PLATFORM_NAME}/media/MediaEffect developers/build/prebuilts/gradle/BasicManagedProfile samples/${PLATFORM_NAME}/admin/BasicManagedProfile developers/build/prebuilts/gradle/Camera2Basic samples/${PLATFORM_NAME}/media/Camera2Basic developers/build/prebuilts/gradle/Camera2Video samples/${PLATFORM_NAME}/media/Camera2Video |