[automerger skipped] Add metadata for mouse cursor. am: b0412cfa am:...
[automerger skipped] Add metadata for mouse cursor. am: b0412cfa am: 555e4f25 -s ours am: b1286ecd -s ours
am skip reason: Change-Id Ia7e0c952fcaefd14280322d9b2269f4dba38e8da with SHA-1 01a5613b is in history
Change-Id: I6a3c068cb9766e41e244f2cc7f7a7567291bd048