* commit '12c9e498':
  Changes made by intelliJ 14.1

am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

* commit '2ea209ab':
  docs: Update device art generator to include Wear generic devices.

am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs

* commit '8d0df9b8':
  docs: Update device art generator to include Wear generic devices.

am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

* commit 'e726495a':
  docs: Fix issue with onCreate() method declaration in file backup section

am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs

* commit 'b6de0316':
  docs: Fix notification api guide issues (7461154, 12765600)

am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs

* commit 'fe5e7e92':
  docs: Fix issue with onCreate() method declaration in file backup section

* commit 'e1f90b4e':
  docs: Fix notification api guide issues (7461154, 12765600)

bug: 3180881
Change-Id: I9616ec0d559bfbce669c5afc5b1742f6f5271fa5

bug: 14617426
Change-Id: I1f693a908c6e8c8cf8cf612fefd8553754978639

am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs

* commit '31622894':
  Adding videos for 5.0 changes and watch face development.

bug: 7461154
bug: 12765600
Change-Id: Ib4aff7f6481a514bf01894cad4984fed09f015e2

* commit 'c86ac21f':
  Adding videos for 5.0 changes and watch face development.

am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs

* commit '9b432bbe':
  docs: Fix various issues with incorrect code samples.

* commit 'e49fbfa2':
  docs: Fix various issues with incorrect code samples.

 On branch pilot-videos
 Changes to be committed:
	modified:   docs/html/about/versions/android-5.0-changes.jd
	modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b

am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs

* commit '99b91b2f':
  Doc change: refactor GCM docs to be platform-agnostic.

* commit 'c9dbaf04':
  Doc change: refactor GCM docs to be platform-agnostic.

bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac

Fix for:

b/17733410

Change-Id: I6dabe6d0985dac7cf280c780140339c6250ac6e2

* commit 'd224fb8a':
  docs: remove + annotations in version references

* commit 'ba20f98c':
  docs: remove + annotations in version references

* commit '42d3b66f':
  Fix a few typos in Parcel.java.

* commit 'e0852368':
  Fix a few typos in Parcel.java.

Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16

Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4

* commit 'd14b6432':
  docs: February 2015 Dashboard updates

* commit 'eba583e3':
  docs: February 2015 Dashboard updates

Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282

am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de1 automerge: 9e7e8afb
automerge: 27d099a7

* commit '27d099a7':

am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de1
automerge: 9e7e8afb

* commit '9e7e8afb':

automerge: f02a8d9f

* commit 'f02a8d9f':
  docs: training intent doc error update

* commit '1a9bf5c1':
  docs: training intent doc error update